Upstream some more content/ DEPS-related cleanup.

content/app/android/library_loader_hooks.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 "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "content/app/android/content_jni_registrar.h"
-#include "content/browser/android/command_line.h"
+#include "content/common/android/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 
 namespace {
 base::AtExitManager* g_at_exit_manager = NULL;
 }
 
 jboolean LibraryLoaderEntryHook(JNIEnv* env, jclass clazz,
                                 jobjectArray init_command_line) {
@@ skipping 50 matching lines @@
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // TODO(bulach): use the jni generator once we move jni_helper methods here.
   const JNINativeMethod kMethods[] = {
       { "nativeLibraryLoadedOnMainThread", "([Ljava/lang/String;)Z",
           reinterpret_cast<void*>(LibraryLoaderEntryHook) },
   };
   const int kMethodsSize = arraysize(kMethods);
   const char kLibraryLoaderPath[] =
-    "org/chromium/content/browser/LibraryLoader";
+    "org/chromium/content/app/LibraryLoader";

[Yaron, 2012/06/15 17:40:35]

If you rebase this function is gone (replaced with JNI generator)

[no sievers, 2012/06/15 20:34:41]

Done.

   base::android::ScopedJavaLocalRef<jclass> clazz =
       base::android::GetClass(env, kLibraryLoaderPath);
 
   if (env->RegisterNatives(clazz.obj(),
                            kMethods,
                            kMethodsSize) < 0) {
     return false;
   }
   return true;
 }
 
 }  // namespace content