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, 3 insertions, 3 deletions

diff --git a/chromium/ui/gfx/android/java_bitmap.cc b/chromium/ui/gfx/android/java_bitmap.cc
index 6c2eaa845a2..2a1be65d215 100644
--- a/chromium/ui/gfx/android/java_bitmap.cc
+++ b/chromium/ui/gfx/android/java_bitmap.cc
@@ -39,11 +39,11 @@ JavaBitmap::~JavaBitmap() {
 
 // static
 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
-  return ui::RegisterNativesImpl(env);
+  return RegisterNativesImpl(env);
 }
 
 static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
-  return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
+  return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
       size.width(), size.height());
 }
 
@@ -87,7 +87,7 @@ SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) {
   DCHECK(!size.IsEmpty());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
-  ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
+  ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
       env, jname.obj(), size.width(), size.height()));
   if (jobj.is_null())
     return SkBitmap();