Revert 225857 "gfx: Create a separate gfx component out of ui."

trunk/src/ui/gfx/android/java_bitmap.cc

 // Copyright (c) 2012 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 "ui/gfx/android/java_bitmap.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   stride_ = info.stride;
 }
 
 JavaBitmap::~JavaBitmap() {
   int err = AndroidBitmap_unlockPixels(AttachCurrentThread(), bitmap_);
   DCHECK(!err);
 }
 
 // static
 bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
-  return RegisterNativesImpl(env);
+  return ui::RegisterNativesImpl(env);
 }
 
 static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
-  return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
+  return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
       size.width(), size.height());
 }
 
 ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
   DCHECK(skbitmap);
   DCHECK_EQ(skbitmap->bytesPerPixel(), 4);
 
   ScopedJavaLocalRef<jobject> jbitmap =
       CreateJavaBitmap(gfx::Size(skbitmap->width(), skbitmap->height()));
   SkAutoLockPixels src_lock(*skbitmap);
@@ skipping 23 matching lines @@
 
   memcpy(dst_pixels, src_pixels, skbitmap.getSize());
 
   return skbitmap;
 }
 
 SkBitmap CreateSkBitmapFromResource(const char* name, gfx::Size size) {
   DCHECK(!size.IsEmpty());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
-  ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
+  ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
       env, jname.obj(), size.width(), size.height()));
   if (jobj.is_null())
     return SkBitmap();
 
   JavaBitmap jbitmap(jobj.obj());
   SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(jbitmap);
   return skia::ImageOperations::Resize(
       bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height());
 }
 
 }  //  namespace gfx