Fixed the dependency.

- Moved the content_jni_registrar.{h|cc} and library_loader_hooks.cc to content/app/android/
- Moved the android_library_loader_hooks.h to content/public/app/

Those files execute the common tasks for all processes and should belong to content/app/.

BUG=
TEST=
TBR=jrg


Review URL: https://chromiumcodereview.appspot.com/10444113

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140062 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 21 insertions, 15 deletions

diff --git a/content/app/android/OWNERS b/content/app/android/OWNERS
new file mode 100644
index 0000000..09e93ca
--- /dev/null
+++ b/content/app/android/OWNERS
@@ -0,0 +1,5 @@
+jrg@chromium.org
+michaelbai@chromium.org
+sievers@chromium.org
+yfriedman@chromium.org
+
diff --git a/content/browser/android/content_jni_registrar.cc b/content/app/android/content_jni_registrar.cc
index aa5064b..e9c8e00 100644
--- a/content/browser/android/content_jni_registrar.cc
+++ b/content/app/android/content_jni_registrar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/content_jni_registrar.h"
+#include "content/app/android/content_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
diff --git a/content/browser/android/content_jni_registrar.h b/content/app/android/content_jni_registrar.h
index ce41c63..df83785 100644
--- a/content/browser/android/content_jni_registrar.h
+++ b/content/app/android/content_jni_registrar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_ANDROID_CONTENT_JNI_REGISTRAR_H_
-#define CONTENT_BROWSER_ANDROID_CONTENT_JNI_REGISTRAR_H_
+#ifndef CONTENT_APP_ANDROID_CONTENT_JNI_REGISTRAR_H_
+#define CONTENT_APP_ANDROID_CONTENT_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
@@ -16,4 +16,4 @@ bool RegisterJni(JNIEnv* env);
 }  // namespace android
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_ANDROID_CONTENT_JNI_REGISTRAR_H_
+#endif  // CONTENT_APP_ANDROID_CONTENT_JNI_REGISTRAR_H_
diff --git a/content/browser/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 30b266f..ef01391 100644
--- a/content/browser/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/browser/android_library_loader_hooks.h"
+#include "content/public/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_registrar.h"
@@ -17,9 +17,9 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
-#include "content/public/common/content_switches.h"
+#include "content/app/android/content_jni_registrar.h"
 #include "content/browser/android/command_line.h"
-#include "content/browser/android/content_jni_registrar.h"
+#include "content/public/common/content_switches.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 75d1cc7..07f7b5a 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -13,9 +13,13 @@
     '../ui/ui.gyp:ui',
   ],
   'sources': [
+    'app/android/content_jni_registrar.cc',
+    'app/android/content_jni_registrar.h',
+    'app/android/library_loader_hooks.cc',
     'app/content_main.cc',
     'app/content_main_runner.cc',
     'app/startup_helper_win.cc',
+    'public/app/android_library_loader_hooks.h',
     'public/app/content_main.h',
     'public/app/content_main_delegate.cc',
     'public/app/content_main_delegate.h',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 98aec01..cfbcba1 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -31,7 +31,6 @@
     'port/browser/render_view_host_delegate_view.h',
     'port/browser/render_widget_host_view_port.h',
     'public/browser/access_token_store.h',
-    'public/browser/android_library_loader_hooks.h',
     'public/browser/browser_accessibility_state.h',
     'public/browser/browser_child_process_host.h',
     'public/browser/browser_child_process_host_delegate.cc',
@@ -187,13 +186,10 @@
     'browser/accessibility/browser_accessibility_win.h',
     'browser/android/command_line.cc',
     'browser/android/command_line.h',
-    'browser/android/content_jni_registrar.cc',
-    'browser/android/content_jni_registrar.h',
     'browser/android/download_controller.cc',
     'browser/android/download_controller.h',
     'browser/android/jni_helper.cc',
     'browser/android/jni_helper.h',
-    'browser/android/library_loader_hooks.cc',
     'browser/android/trace_event_binding.cc',
     'browser/android/trace_event_binding.h',
     'browser/appcache/appcache_dispatcher_host.cc',
diff --git a/content/public/browser/android_library_loader_hooks.h b/content/public/app/android_library_loader_hooks.h
index 5670b1a..596b4a7 100644
--- a/content/public/browser/android_library_loader_hooks.h
+++ b/content/public/app/android_library_loader_hooks.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_BROWSER_ANDROID_LIBRARY_LOADER_HOOKS_H_
-#define CONTENT_PUBLIC_BROWSER_ANDROID_LIBRARY_LOADER_HOOKS_H_
+#ifndef CONTENT_PUBLIC_APP_ANDROID_LIBRARY_LOADER_HOOKS_H_
+#define CONTENT_PUBLIC_APP_ANDROID_LIBRARY_LOADER_HOOKS_H_
 
 #include <jni.h>
 
@@ -19,4 +19,5 @@ bool RegisterLibraryLoaderEntryHook(JNIEnv* env);
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_ANDROID_LIBRARY_LOADER_HOOKS_H_
+#endif  // CONTENT_PUBLIC_APP_ANDROID_LIBRARY_LOADER_HOOKS_H_
+
diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index 0775a970..39a84ce 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main_runner.h"
-#include "content/public/browser/android_library_loader_hooks.h"
 #include "content/shell/shell_main_delegate.h"
 #include "content/shell/android/shell_manager.h"
 #include "content/shell/android/shell_view.h"