Cherrypick: [Android] Move content/browser/{renderer_host => android}/java/*
Original description:
> [Android] Move content/browser/{renderer_host => android}/java/*
>
> As jam@ has suggested here: https://codereview.chromium.org/353163002/#msg4
> Java Bridge isn't used in renderer_host, thus content/browser/android/java
> is a better location.
>
> BUG=355644
>
> Review URL: https://codereview.chromium.org/336313018
>
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280798 0039d316-1c4b-4281-b951-d872f2087c98
Also updated Android makefiles for all platforms.
Bug: 13238305
Change-Id: I5671b55b40a94833dce71850ecd1db9de90a59b5
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 47ff5d1..17b046f 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -19,6 +19,7 @@
#include "content/browser/android/date_time_chooser_android.h"
#include "content/browser/android/download_controller_android_impl.h"
#include "content/browser/android/interstitial_page_delegate_android.h"
+#include "content/browser/android/java/java_bound_object.h"
#include "content/browser/android/load_url_params.h"
#include "content/browser/android/surface_texture_peer_browser_impl.h"
#include "content/browser/android/tracing_controller_android.h"
@@ -34,7 +35,6 @@
#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/renderer_host/input/motion_event_android.h"
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
-#include "content/browser/renderer_host/java/java_bound_object.h"
#include "content/browser/screen_orientation/screen_orientation_provider_android.h"
#include "content/browser/speech/speech_recognizer_impl_android.h"
#include "content/browser/time_zone_monitor_android.h"
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index fc0af4c..6e533fc 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -19,6 +19,8 @@
#include "cc/output/begin_frame_args.h"
#include "content/browser/android/gesture_event_type.h"
#include "content/browser/android/interstitial_page_delegate_android.h"
+#include "content/browser/android/java/java_bound_object.h"
+#include "content/browser/android/java/java_bridge_dispatcher_host_manager.h"
#include "content/browser/android/load_url_params.h"
#include "content/browser/frame_host/interstitial_page_impl.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
@@ -29,8 +31,6 @@
#include "content/browser/renderer_host/input/motion_event_android.h"
#include "content/browser/renderer_host/input/web_input_event_builders_android.h"
#include "content/browser/renderer_host/input/web_input_event_util.h"
-#include "content/browser/renderer_host/java/java_bound_object.h"
-#include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
diff --git a/content/browser/android/java/DEPS b/content/browser/android/java/DEPS
new file mode 100644
index 0000000..430199d
--- /dev/null
+++ b/content/browser/android/java/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+content/child", # For java bridge bindings
+]
diff --git a/content/browser/renderer_host/java/OWNERS b/content/browser/android/java/OWNERS
similarity index 100%
rename from content/browser/renderer_host/java/OWNERS
rename to content/browser/android/java/OWNERS
diff --git a/content/browser/renderer_host/java/gin_java_bound_object.cc b/content/browser/android/java/gin_java_bound_object.cc
similarity index 97%
rename from content/browser/renderer_host/java/gin_java_bound_object.cc
rename to content/browser/android/java/gin_java_bound_object.cc
index 70abba8..0440136 100644
--- a/content/browser/renderer_host/java/gin_java_bound_object.cc
+++ b/content/browser/android/java/gin_java_bound_object.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/renderer_host/java/gin_java_bound_object.h"
+#include "content/browser/android/java/gin_java_bound_object.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/jni_helper.h"
using base::android::AttachCurrentThread;
using base::android::ScopedJavaLocalRef;
diff --git a/content/browser/renderer_host/java/gin_java_bound_object.h b/content/browser/android/java/gin_java_bound_object.h
similarity index 92%
rename from content/browser/renderer_host/java/gin_java_bound_object.h
rename to content/browser/android/java/gin_java_bound_object.h
index 610b0c4..ce1d403 100644
--- a/content/browser/renderer_host/java/gin_java_bound_object.h
+++ b/content/browser/android/java/gin_java_bound_object.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_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_H_
#include <map>
#include <set>
@@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
-#include "content/browser/renderer_host/java/java_method.h"
+#include "content/browser/android/java/java_method.h"
namespace content {
@@ -93,4 +93,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_H_
diff --git a/content/browser/renderer_host/java/gin_java_bound_object_delegate.cc b/content/browser/android/java/gin_java_bound_object_delegate.cc
similarity index 93%
rename from content/browser/renderer_host/java/gin_java_bound_object_delegate.cc
rename to content/browser/android/java/gin_java_bound_object_delegate.cc
index 92b1ccc..bf964d7 100644
--- a/content/browser/renderer_host/java/gin_java_bound_object_delegate.cc
+++ b/content/browser/android/java/gin_java_bound_object_delegate.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/renderer_host/java/gin_java_bound_object_delegate.h"
+#include "content/browser/android/java/gin_java_bound_object_delegate.h"
namespace content {
diff --git a/content/browser/renderer_host/java/gin_java_bound_object_delegate.h b/content/browser/android/java/gin_java_bound_object_delegate.h
similarity index 73%
rename from content/browser/renderer_host/java/gin_java_bound_object_delegate.h
rename to content/browser/android/java/gin_java_bound_object_delegate.h
index 9852d91..09828c3 100644
--- a/content/browser/renderer_host/java/gin_java_bound_object_delegate.h
+++ b/content/browser/android/java/gin_java_bound_object_delegate.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
#include "base/memory/ref_counted.h"
-#include "content/browser/renderer_host/java/gin_java_bound_object.h"
-#include "content/browser/renderer_host/java/gin_java_method_invocation_helper.h"
+#include "content/browser/android/java/gin_java_bound_object.h"
+#include "content/browser/android/java/gin_java_method_invocation_helper.h"
namespace content {
@@ -35,4 +35,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BOUND_OBJECT_DELEGATE_H_
diff --git a/content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
similarity index 98%
rename from content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc
rename to content/browser/android/java/gin_java_bridge_dispatcher_host.cc
index 6c6e86b..a60310d 100644
--- a/content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc
+++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.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/renderer_host/java/gin_java_bridge_dispatcher_host.h"
+#include "content/browser/android/java/gin_java_bridge_dispatcher_host.h"
#include "base/android/java_handler_thread.h"
#include "base/android/jni_android.h"
@@ -11,8 +11,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task_runner_util.h"
-#include "content/browser/renderer_host/java/gin_java_bound_object_delegate.h"
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/gin_java_bound_object_delegate.h"
+#include "content/browser/android/java/jni_helper.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "content/common/android/hash_set.h"
#include "content/common/gin_java_bridge_messages.h"
diff --git a/content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.h b/content/browser/android/java/gin_java_bridge_dispatcher_host.h
similarity index 92%
rename from content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.h
rename to content/browser/android/java/gin_java_bridge_dispatcher_host.h
index d77da3a..3ccd46f 100644
--- a/content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.h
+++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.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_RENDERER_HOST_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
#include <map>
#include <set>
@@ -12,8 +12,8 @@
#include "base/android/scoped_java_ref.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "content/browser/renderer_host/java/gin_java_bound_object.h"
-#include "content/browser/renderer_host/java/gin_java_method_invocation_helper.h"
+#include "content/browser/android/java/gin_java_bound_object.h"
+#include "content/browser/android/java/gin_java_method_invocation_helper.h"
#include "content/public/browser/web_contents_observer.h"
namespace base {
@@ -120,4 +120,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_BRIDGE_DISPATCHER_HOST_H_
diff --git a/content/browser/renderer_host/java/gin_java_method_invocation_helper.cc b/content/browser/android/java/gin_java_method_invocation_helper.cc
similarity index 97%
rename from content/browser/renderer_host/java/gin_java_method_invocation_helper.cc
rename to content/browser/android/java/gin_java_method_invocation_helper.cc
index 5c60ecf..ae7d643 100644
--- a/content/browser/renderer_host/java/gin_java_method_invocation_helper.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper.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/renderer_host/java/gin_java_method_invocation_helper.h"
+#include "content/browser/android/java/gin_java_method_invocation_helper.h"
#include <unistd.h>
@@ -10,9 +10,9 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/float_util.h"
-#include "content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.h"
-#include "content/browser/renderer_host/java/java_method.h"
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/gin_java_script_to_java_types_coercion.h"
+#include "content/browser/android/java/java_method.h"
+#include "content/browser/android/java/jni_helper.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/java/gin_java_method_invocation_helper.h b/content/browser/android/java/gin_java_method_invocation_helper.h
similarity index 91%
rename from content/browser/renderer_host/java/gin_java_method_invocation_helper.h
rename to content/browser/android/java/gin_java_method_invocation_helper.h
index 4cdb09b..014e311 100644
--- a/content/browser/renderer_host/java/gin_java_method_invocation_helper.h
+++ b/content/browser/android/java/gin_java_method_invocation_helper.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_RENDERER_HOST_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
#include <map>
@@ -11,8 +11,8 @@
#include "base/android/scoped_java_ref.h"
#include "base/memory/ref_counted.h"
#include "base/values.h"
-#include "content/browser/renderer_host/java/gin_java_bound_object.h"
-#include "content/browser/renderer_host/java/java_type.h"
+#include "content/browser/android/java/gin_java_bound_object.h"
+#include "content/browser/android/java/java_type.h"
#include "content/common/android/gin_java_bridge_errors.h"
#include "content/common/content_export.h"
@@ -114,4 +114,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_METHOD_INVOCATION_HELPER_H_
diff --git a/content/browser/renderer_host/java/gin_java_method_invocation_helper_unittest.cc b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
similarity index 98%
rename from content/browser/renderer_host/java/gin_java_method_invocation_helper_unittest.cc
rename to content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
index 067a5e1..dab5d1a 100644
--- a/content/browser/renderer_host/java/gin_java_method_invocation_helper_unittest.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/renderer_host/java/gin_java_method_invocation_helper.h"
+#include "content/browser/android/java/gin_java_method_invocation_helper.h"
#include "base/android/jni_android.h"
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/jni_helper.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
similarity index 99%
rename from content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc
rename to content/browser/android/java/gin_java_script_to_java_types_coercion.cc
index 8f7c29f..1a80813 100644
--- a/content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc
+++ b/content/browser/android/java/gin_java_script_to_java_types_coercion.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/renderer_host/java/gin_java_script_to_java_types_coercion.h"
+#include "content/browser/android/java/gin_java_script_to_java_types_coercion.h"
#include <unistd.h>
diff --git a/content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.h b/content/browser/android/java/gin_java_script_to_java_types_coercion.h
similarity index 64%
rename from content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.h
rename to content/browser/android/java/gin_java_script_to_java_types_coercion.h
index 1df7345..25b4fc6 100644
--- a/content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.h
+++ b/content/browser/android/java/gin_java_script_to_java_types_coercion.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
#include <map>
#include "base/android/jni_weak_ref.h"
#include "base/values.h"
-#include "content/browser/renderer_host/java/gin_java_bound_object.h"
-#include "content/browser/renderer_host/java/java_type.h"
+#include "content/browser/android/java/gin_java_bound_object.h"
+#include "content/browser/android/java/java_type.h"
namespace content {
@@ -30,4 +30,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_GIN_JAVA_SCRIPT_TO_JAVA_TYPES_COERCION_H_
diff --git a/content/browser/renderer_host/java/java_bound_object.cc b/content/browser/android/java/java_bound_object.cc
similarity index 98%
rename from content/browser/renderer_host/java/java_bound_object.cc
rename to content/browser/android/java/java_bound_object.cc
index f812c42..f7d129e 100644
--- a/content/browser/renderer_host/java/java_bound_object.cc
+++ b/content/browser/android/java/java_bound_object.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_bound_object.h"
+#include "content/browser/android/java/java_bound_object.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
@@ -10,9 +10,9 @@
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
-#include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
-#include "content/browser/renderer_host/java/java_type.h"
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/java_bridge_dispatcher_host_manager.h"
+#include "content/browser/android/java/java_type.h"
+#include "content/browser/android/java/jni_helper.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/WebKit/public/web/WebBindings.h"
diff --git a/content/browser/renderer_host/java/java_bound_object.h b/content/browser/android/java/java_bound_object.h
similarity index 91%
rename from content/browser/renderer_host/java/java_bound_object.h
rename to content/browser/android/java/java_bound_object.h
index f29aed6..49c9d2f 100644
--- a/content/browser/renderer_host/java/java_bound_object.h
+++ b/content/browser/android/java/java_bound_object.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_BOUND_OBJECT_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_BOUND_OBJECT_H_
#include <jni.h>
#include <map>
@@ -13,7 +13,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "content/browser/renderer_host/java/java_method.h"
+#include "content/browser/android/java/java_method.h"
#include "third_party/npapi/bindings/npruntime.h"
namespace content {
@@ -93,4 +93,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_BOUND_OBJECT_H_
diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.cc b/content/browser/android/java/java_bridge_channel_host.cc
similarity index 95%
rename from content/browser/renderer_host/java/java_bridge_channel_host.cc
rename to content/browser/android/java/java_bridge_channel_host.cc
index 8f53b9d..a9bbbad 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.cc
+++ b/content/browser/android/java/java_bridge_channel_host.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_bridge_channel_host.h"
+#include "content/browser/android/java/java_bridge_channel_host.h"
#include "base/atomicops.h"
#include "base/lazy_instance.h"
diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.h b/content/browser/android/java/java_bridge_channel_host.h
similarity index 82%
rename from content/browser/renderer_host/java/java_bridge_channel_host.h
rename to content/browser/android/java/java_bridge_channel_host.h
index 3f3f146..88adad9 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.h
+++ b/content/browser/android/java/java_bridge_channel_host.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
#include "content/child/npapi/np_channel_base.h"
@@ -49,4 +49,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/android/java/java_bridge_dispatcher_host.cc
similarity index 96%
rename from content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
rename to content/browser/android/java/java_bridge_dispatcher_host.cc
index 922b03a..50299d6 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/android/java/java_bridge_dispatcher_host.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_bridge_dispatcher_host.h"
+#include "content/browser/android/java/java_bridge_dispatcher_host.h"
#include "base/android/java_handler_thread.h"
#include "base/bind.h"
#include "base/lazy_instance.h"
-#include "content/browser/renderer_host/java/java_bridge_channel_host.h"
+#include "content/browser/android/java/java_bridge_channel_host.h"
#include "content/child/child_process.h"
#include "content/child/npapi/npobject_stub.h"
#include "content/child/npapi/npobject_util.h" // For CreateNPVariantParam()
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/android/java/java_bridge_dispatcher_host.h
similarity index 89%
rename from content/browser/renderer_host/java/java_bridge_dispatcher_host.h
rename to content/browser/android/java/java_bridge_dispatcher_host.h
index a656f07..6175be2 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
+++ b/content/browser/android/java/java_bridge_dispatcher_host.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
#include <vector>
#include "base/memory/ref_counted.h"
@@ -68,4 +68,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_H_
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/android/java/java_bridge_dispatcher_host_manager.cc
similarity index 94%
rename from content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
rename to content/browser/android/java/java_bridge_dispatcher_host_manager.cc
index 635a1d1..ec36e95 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
+++ b/content/browser/android/java/java_bridge_dispatcher_host_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
+#include "content/browser/android/java/java_bridge_dispatcher_host_manager.h"
#include "base/android/jni_android.h"
#include "base/android/jni_weak_ref.h"
@@ -10,8 +10,8 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/browser/renderer_host/java/java_bound_object.h"
-#include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h"
+#include "content/browser/android/java/java_bound_object.h"
+#include "content/browser/android/java/java_bridge_dispatcher_host.h"
#include "content/common/android/hash_set.h"
#include "content/common/java_bridge_messages.h"
#include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h b/content/browser/android/java/java_bridge_dispatcher_host_manager.h
similarity index 90%
rename from content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h
rename to content/browser/android/java/java_bridge_dispatcher_host_manager.h
index 8d03576..2eb1067 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h
+++ b/content/browser/android/java/java_bridge_dispatcher_host_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
#include <map>
@@ -73,4 +73,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
diff --git a/content/browser/renderer_host/java/java_method.cc b/content/browser/android/java/java_method.cc
similarity index 97%
rename from content/browser/renderer_host/java/java_method.cc
rename to content/browser/android/java/java_method.cc
index 03bdb2d..d1ebbb5 100644
--- a/content/browser/renderer_host/java/java_method.cc
+++ b/content/browser/android/java/java_method.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_method.h"
+#include "content/browser/android/java/java_method.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/lazy_instance.h"
#include "base/memory/singleton.h"
#include "base/strings/string_util.h" // For ReplaceSubstringsAfterOffset
-#include "content/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/jni_helper.h"
using base::android::AttachCurrentThread;
using base::android::ConvertJavaStringToUTF8;
diff --git a/content/browser/renderer_host/java/java_method.h b/content/browser/android/java/java_method.h
similarity index 79%
rename from content/browser/renderer_host/java/java_method.h
rename to content/browser/android/java/java_method.h
index 6477263..b5ba26a 100644
--- a/content/browser/renderer_host/java/java_method.h
+++ b/content/browser/android/java/java_method.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_METHOD_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_METHOD_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_METHOD_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_METHOD_H_
#include <jni.h>
#include <string>
#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "content/browser/renderer_host/java/java_type.h"
+#include "content/browser/android/java/java_type.h"
#include "content/common/content_export.h"
namespace content {
@@ -47,4 +47,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_METHOD_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_METHOD_H_
diff --git a/content/browser/renderer_host/java/java_type.cc b/content/browser/android/java/java_type.cc
similarity index 95%
rename from content/browser/renderer_host/java/java_type.cc
rename to content/browser/android/java/java_type.cc
index b590e77..c2808fe 100644
--- a/content/browser/renderer_host/java/java_type.cc
+++ b/content/browser/android/java/java_type.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/java_type.h"
+#include "content/browser/android/java/java_type.h"
#include "base/logging.h"
diff --git a/content/browser/renderer_host/java/java_type.h b/content/browser/android/java/java_type.h
similarity index 81%
rename from content/browser/renderer_host/java/java_type.h
rename to content/browser/android/java/java_type.h
index fe7845e..884f704 100644
--- a/content/browser/renderer_host/java/java_type.h
+++ b/content/browser/android/java/java_type.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_TYPE_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_TYPE_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JAVA_TYPE_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JAVA_TYPE_H_
#include <string>
@@ -47,4 +47,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_TYPE_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JAVA_TYPE_H_
diff --git a/content/browser/renderer_host/java/jni_helper.cc b/content/browser/android/java/jni_helper.cc
similarity index 95%
rename from content/browser/renderer_host/java/jni_helper.cc
rename to content/browser/android/java/jni_helper.cc
index 86874b0..09026e7 100644
--- a/content/browser/renderer_host/java/jni_helper.cc
+++ b/content/browser/android/java/jni_helper.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/jni_helper.h"
#include <map>
diff --git a/content/browser/renderer_host/java/jni_helper.h b/content/browser/android/java/jni_helper.h
similarity index 78%
rename from content/browser/renderer_host/java/jni_helper.h
rename to content/browser/android/java/jni_helper.h
index aaba53b..25c8515 100644
--- a/content/browser/renderer_host/java/jni_helper.h
+++ b/content/browser/android/java/jni_helper.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JNI_HELPER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JNI_HELPER_H_
+#ifndef CONTENT_BROWSER_ANDROID_JAVA_JNI_HELPER_H_
+#define CONTENT_BROWSER_ANDROID_JAVA_JNI_HELPER_H_
#include <jni.h>
@@ -24,4 +24,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_JAVA_JNI_HELPER_H_
+#endif // CONTENT_BROWSER_ANDROID_JAVA_JNI_HELPER_H_
diff --git a/content/browser/renderer_host/java/jni_helper_unittest.cc b/content/browser/android/java/jni_helper_unittest.cc
similarity index 95%
rename from content/browser/renderer_host/java/jni_helper_unittest.cc
rename to content/browser/android/java/jni_helper_unittest.cc
index 34b17c2..01b5ecf 100644
--- a/content/browser/renderer_host/java/jni_helper_unittest.cc
+++ b/content/browser/android/java/jni_helper_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/browser/renderer_host/java/jni_helper.h"
+#include "content/browser/android/java/jni_helper.h"
#include "base/android/jni_android.h"
#include "base/at_exit.h"
diff --git a/content/browser/renderer_host/java/DEPS b/content/browser/renderer_host/java/DEPS
deleted file mode 100644
index 0551243..0000000
--- a/content/browser/renderer_host/java/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
- "+content/child", # For java bridge bindings
- "+third_party/WebKit/public/web/WebBindings.h", # For java bridge bindings
-]
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index cf7c3d0..588c2c0 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1283,30 +1283,30 @@
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h',
],
'android_browser_sources': [
- 'browser/renderer_host/java/gin_java_bound_object.cc',
- 'browser/renderer_host/java/gin_java_bound_object.h',
- 'browser/renderer_host/java/gin_java_bound_object_delegate.cc',
- 'browser/renderer_host/java/gin_java_bound_object_delegate.h',
- 'browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc',
- 'browser/renderer_host/java/gin_java_bridge_dispatcher_host.h',
- 'browser/renderer_host/java/gin_java_method_invocation_helper.cc',
- 'browser/renderer_host/java/gin_java_method_invocation_helper.h',
- 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc',
- 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.h',
- 'browser/renderer_host/java/java_bound_object.cc',
- 'browser/renderer_host/java/java_bound_object.h',
- 'browser/renderer_host/java/java_bridge_channel_host.cc',
- 'browser/renderer_host/java/java_bridge_channel_host.h',
- 'browser/renderer_host/java/java_bridge_dispatcher_host.cc',
- 'browser/renderer_host/java/java_bridge_dispatcher_host.h',
- 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc',
- 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h',
- 'browser/renderer_host/java/java_method.cc',
- 'browser/renderer_host/java/java_method.h',
- 'browser/renderer_host/java/java_type.cc',
- 'browser/renderer_host/java/java_type.h',
- 'browser/renderer_host/java/jni_helper.cc',
- 'browser/renderer_host/java/jni_helper.h',
+ 'browser/android/java/gin_java_bound_object.cc',
+ 'browser/android/java/gin_java_bound_object.h',
+ 'browser/android/java/gin_java_bound_object_delegate.cc',
+ 'browser/android/java/gin_java_bound_object_delegate.h',
+ 'browser/android/java/gin_java_bridge_dispatcher_host.cc',
+ 'browser/android/java/gin_java_bridge_dispatcher_host.h',
+ 'browser/android/java/gin_java_method_invocation_helper.cc',
+ 'browser/android/java/gin_java_method_invocation_helper.h',
+ 'browser/android/java/gin_java_script_to_java_types_coercion.cc',
+ 'browser/android/java/gin_java_script_to_java_types_coercion.h',
+ 'browser/android/java/java_bound_object.cc',
+ 'browser/android/java/java_bound_object.h',
+ 'browser/android/java/java_bridge_channel_host.cc',
+ 'browser/android/java/java_bridge_channel_host.h',
+ 'browser/android/java/java_bridge_dispatcher_host.cc',
+ 'browser/android/java/java_bridge_dispatcher_host.h',
+ 'browser/android/java/java_bridge_dispatcher_host_manager.cc',
+ 'browser/android/java/java_bridge_dispatcher_host_manager.h',
+ 'browser/android/java/java_method.cc',
+ 'browser/android/java/java_method.h',
+ 'browser/android/java/java_type.cc',
+ 'browser/android/java/java_type.h',
+ 'browser/android/java/jni_helper.cc',
+ 'browser/android/java/jni_helper.h',
],
'webrtc_browser_sources': [
'browser/media/webrtc_internals.cc',
diff --git a/content/content_browser.target.darwin-arm.mk b/content/content_browser.target.darwin-arm.mk
index 95780e7..33b6258 100644
--- a/content/content_browser.target.darwin-arm.mk
+++ b/content/content_browser.target.darwin-arm.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.darwin-arm64.mk b/content/content_browser.target.darwin-arm64.mk
index ae4bdb4..7ab690b 100644
--- a/content/content_browser.target.darwin-arm64.mk
+++ b/content/content_browser.target.darwin-arm64.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.darwin-mips.mk b/content/content_browser.target.darwin-mips.mk
index 53b9496..d784770 100644
--- a/content/content_browser.target.darwin-mips.mk
+++ b/content/content_browser.target.darwin-mips.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.darwin-x86.mk b/content/content_browser.target.darwin-x86.mk
index b895015..048f308 100644
--- a/content/content_browser.target.darwin-x86.mk
+++ b/content/content_browser.target.darwin-x86.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.darwin-x86_64.mk b/content/content_browser.target.darwin-x86_64.mk
index c5a2b73..f95b225 100644
--- a/content/content_browser.target.darwin-x86_64.mk
+++ b/content/content_browser.target.darwin-x86_64.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.linux-arm.mk b/content/content_browser.target.linux-arm.mk
index 95780e7..33b6258 100644
--- a/content/content_browser.target.linux-arm.mk
+++ b/content/content_browser.target.linux-arm.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.linux-arm64.mk b/content/content_browser.target.linux-arm64.mk
index ae4bdb4..7ab690b 100644
--- a/content/content_browser.target.linux-arm64.mk
+++ b/content/content_browser.target.linux-arm64.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.linux-mips.mk b/content/content_browser.target.linux-mips.mk
index 53b9496..d784770 100644
--- a/content/content_browser.target.linux-mips.mk
+++ b/content/content_browser.target.linux-mips.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.linux-x86.mk b/content/content_browser.target.linux-x86.mk
index b895015..048f308 100644
--- a/content/content_browser.target.linux-x86.mk
+++ b/content/content_browser.target.linux-x86.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_browser.target.linux-x86_64.mk b/content/content_browser.target.linux-x86_64.mk
index c5a2b73..f95b225 100644
--- a/content/content_browser.target.linux-x86_64.mk
+++ b/content/content_browser.target.linux-x86_64.mk
@@ -510,18 +510,18 @@
content/browser/renderer_host/p2p/socket_host_throttler.cc \
content/browser/renderer_host/p2p/socket_host_udp.cc \
content/browser/renderer_host/p2p/socket_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_bound_object.cc \
- content/browser/renderer_host/java/gin_java_bound_object_delegate.cc \
- content/browser/renderer_host/java/gin_java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/gin_java_method_invocation_helper.cc \
- content/browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc \
- content/browser/renderer_host/java/java_bound_object.cc \
- content/browser/renderer_host/java/java_bridge_channel_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host.cc \
- content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc \
- content/browser/renderer_host/java/java_method.cc \
- content/browser/renderer_host/java/java_type.cc \
- content/browser/renderer_host/java/jni_helper.cc \
+ content/browser/android/java/gin_java_bound_object.cc \
+ content/browser/android/java/gin_java_bound_object_delegate.cc \
+ content/browser/android/java/gin_java_bridge_dispatcher_host.cc \
+ content/browser/android/java/gin_java_method_invocation_helper.cc \
+ content/browser/android/java/gin_java_script_to_java_types_coercion.cc \
+ content/browser/android/java/java_bound_object.cc \
+ content/browser/android/java/java_bridge_channel_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host.cc \
+ content/browser/android/java/java_bridge_dispatcher_host_manager.cc \
+ content/browser/android/java/java_method.cc \
+ content/browser/android/java/java_type.cc \
+ content/browser/android/java/jni_helper.cc \
content/browser/media/cdm/browser_cdm_manager.cc \
content/browser/media/media_web_contents_observer.cc
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index d17648d..54fadf2 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -877,8 +877,8 @@
}],
['OS == "android"', {
'sources': [
- 'browser/renderer_host/java/gin_java_method_invocation_helper_unittest.cc',
- 'browser/renderer_host/java/jni_helper_unittest.cc',
+ 'browser/android/java/gin_java_method_invocation_helper_unittest.cc',
+ 'browser/android/java/jni_helper_unittest.cc',
'renderer/java/gin_java_bridge_value_converter_unittest.cc',
],
'sources!': [
