Upstream some more content/ DEPS-related cleanup.

content/public/browser/android/bitmap_holder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[jam, 2012/06/15 22:59:31]

if these helper files stuff is used outside of content, it belongs in base.
that's where helper classes that are common between two modules (in this case
content+chrome) belongs. content\public only has interfaces and structs. see
http://www.chromium.org/developers/content-module/content-api

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_JNI_HELPER_H_
-#define CONTENT_BROWSER_ANDROID_JNI_HELPER_H_
+#ifndef CONTENT_PUBLIC_BROWSER_ANDROID_BITMAP_HOLDER_H_
+#define CONTENT_PUBLIC_BROWSER_ANDROID_BITMAP_HOLDER_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/string16.h"
 #include "ui/gfx/rect.h"
 
 class SkBitmap;
 namespace gfx {
 class Size;
 }
 
+namespace content {
+
+// TODO(sievers): Remove this and use ScopedJavaLocalRef instead.
 // Auto creator/destructor for a JNI frame for local references.  This allows
 // safely having more than 16 local references, and avoids calls to
 // DeleteLocalRef.
 // This should be created on the stack.
 class AutoLocalFrame {
  public:
   AutoLocalFrame(int capacity);
   ~AutoLocalFrame();
 
  private:
@@ skipping 15 matching lines @@
   int format() const;
   uint32_t stride() const;
 
  private:
   jobject bitmap_;
   void* pixels_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLockJavaBitmap);
 };
 
-// Tell Java to write its current stack trace into Android logs.  Note that the
-// trace will stop at the entry point into C++ code.
-void PrintJavaStackTrace();
-
-// Fills in the given vector<string> from a java String[].
-void ConvertJavaArrayOfStringsToVectorOfStrings(
-    JNIEnv* env,
-    jobjectArray jstrings,
-    std::vector<std::string>* vec);
-
 // Helper method to create an Android Java Bitmap object.  You can use the
 // AutoLockJavaBitmap class to manipulate its pixels, and pass it back up
 // to Java code for drawing.  Returns a JNI local reference to the bitmap.
 // If 'keep' is true, then a reference will be kept in a static Java data
 // structure to prevent GC.  In that case, you must call DeleteJavaBitmap() to
 // garbage collect it.
 base::android::ScopedJavaLocalRef<jobject> CreateJavaBitmap(
     const gfx::Size& size, bool keep);
 void DeleteJavaBitmap(jobject bitmap);
 
 // Paint one java bitmap into another.  Scale if needed.
 void PaintJavaBitmapToJavaBitmap(jobject sourceBitmap,
-                                 const gfx::Rect& sourceRect,
-                                 jobject destBitmap,
-                                 const gfx::Rect& destRect);
+                                                const gfx::Rect& sourceRect,

[Ted C, 2012/06/15 20:52:17]

indent of this looks messed up.

+                                                jobject destBitmap,
+                                                const gfx::Rect& destRect);
 
 // Copy the Chromium Skia bitmap into a new Java bitmap.  Useful for small UI
 // bitmaps originating from WebKit that we want to manipulate in Java (such as
 // favicons).  Due to the extra copy, should be avoided for large or frequently
 // used bitmaps.  Returns a local reference to the new bitmap.
 base::android::ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(
     const SkBitmap* skbitmap);
 
-// Registers our JNI methods.
-bool RegisterJniHelper(JNIEnv* env);
+} // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_JNI_HELPER_H_
+#endif  // CONTENT_PUBLIC_BROWSER_ANDROID_BITMAP_HOLDER_H_