Java versions of BlimpContents[,Observer] and BlimpNavigationController

blimp/client/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 399 matching lines @@
       "session/assignment_source.h",
     ]
   }
 
   android_library("blimp_java") {
     srcjar_deps = [ ":blimp_java_enums_srcjar" ]
 
     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.
       "//ui/android:ui_java",
       google_play_services_library,
     ]
 
     java_files = [
       "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
       "app/android/java/src/org/chromium/blimp/auth/TokenSource.java",
@@ skipping 17 matching lines @@
     ]
   }
 
   android_library("blimp_test_java") {
     testonly = true
 
     deps = [
       ":blimp_java",
       "//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",
     ]
   }
 
   shared_library("blimp_client_android") {
     deps = [
       ":client",
       ":jni_headers",
       "//base",
       "//blimp/client:compositor",
+      "//blimp/client/core",
       "//blimp/common",
       "//blimp/common/proto",
       "//blimp/net",
       "//components/safe_json/android:safe_json_jni_headers",
       "//components/url_formatter",
       "//components/version_info",
       "//net",
       "//skia",
       "//ui/base/ime:text_input_types",
       "//ui/gfx/geometry",
@@ skipping 24 matching lines @@
 
     libs = [ "android" ]
   }
 
   android_apk("blimp_apk") {
     deps = [
       ":blimp_apk_manifest",
       ":blimp_client_android",
       ":blimp_java",
       "//base:base_java",
+      "//blimp/client/core:core_java",
       "//components/safe_json/android:safe_json_java",
       "//net/android:net_java",
     ]
     apk_name = "Blimp"
     android_manifest = blimp_apk_manifest
     native_libs = [ "libblimp_client_android.so" ]
   }
 
   instrumentation_test_apk("blimp_test_apk") {
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     deps = [
       ":blimp_test_apk_manifest",
       ":blimp_test_java",
     ]
   }
 }