Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/chromium/gpu/command_buffer/common/logging_android.cc b/chromium/gpu/command_buffer/common/logging_android.cc
deleted file mode 100644
index d660080d4c7..00000000000
--- a/chromium/gpu/command_buffer/common/logging_android.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <android/log.h>
-#include <iostream>
-#include <sstream>
-
-#include "gpu/command_buffer/common/logging.h"
-
-namespace gpu {
-
-namespace {
-std::stringstream* g_log;
-const char* kLogTag = "chromium-gpu";
-}
-
-std::ostream& Logger::stream() {
-  if (!g_log)
-    g_log = new std::stringstream();
-  return *g_log;
-}
-
-Logger::~Logger() {
-  if (!condition_) {
-    __android_log_print(ANDROID_LOG_INFO, kLogTag, "%s", g_log->str().c_str());
-    g_log->str(std::string());
-    if (level_ == FATAL)
-      assert(false);
-  }
-}
-
-}  // namespace gpu