Java versions of BlimpContents[,Observer] and BlimpNavigationController

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 6bc2a4ecfee3d58864bbfb62b42d3b8e79e424e6..33035c263dd1a52c9af3506472cf39154811b4f5 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -413,6 +413,8 @@ if (is_android) {
     deps = [
       ":blimp_java_resources",
       "//base:base_java",
+      "//blimp/client/core:core_java",
+      "//blimp/client/core/public:public_java",
 
       # TODO(dtrainor): Remove the ui_java target once no more Android Toast
       # notifications are used.
@@ -451,12 +453,16 @@ if (is_android) {
       ":blimp_java_resources",
       "//base:base_java",
       "//base:base_java_test_support",
+      "//blimp/client/core:core_java",
+      "//blimp/client/core/public:public_java",
       google_play_services_library,
     ]
 
     java_files = [
       "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
       "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
+      "app/android/javatests/src/org/chromium/blimp/core/BlimpContentsTest.java",
+      "app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java",
     ]
   }
 
@@ -465,6 +471,7 @@ if (is_android) {
       ":client",
       ":jni_headers",
       "//base",
+      "//blimp/client/core",
       "//blimp/common",
       "//blimp/common/proto",
       "//blimp/net",
@@ -510,6 +517,7 @@ if (is_android) {
       ":blimp_java",
       ":blimp_java_resources",
       "//base:base_java",
+      "//blimp/client/core:core_java",
       "//components/safe_json/android:safe_json_java",
       "//net/android:net_java",
       google_play_services_resources,