Tied up BlimpNavigationController to NavigationFeature

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")
 }
 
 source_set("session") {
   sources = [
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
   ]
 
   public_deps = [
     ":feature",
     "//blimp/client/core:switches",
     "//ui/events",
   ]
 
   deps = [
     ":compositor",
     "//base",
     "//blimp/client/core/compositor",
+    "//blimp/client/core/contents",
     "//blimp/client/core/session",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//net",
     "//ui/gfx/geometry",
     "//url:url",
   ]
 }
 
@@ skipping 47 matching lines @@
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("feature") {
   sources = [
     "feature/ime_feature.cc",
     "feature/ime_feature.h",
-    "feature/navigation_feature.cc",
-    "feature/navigation_feature.h",
     "feature/render_widget_feature.cc",
     "feature/render_widget_feature.h",
     "feature/settings_feature.cc",
     "feature/settings_feature.h",
     "feature/tab_control_feature.cc",
     "feature/tab_control_feature.h",
   ]
 
   deps = [
     "//base:base",
@@ skipping 12 matching lines @@
     "//blimp/common/proto",
   ]
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
     "feature/mock_ime_feature_delegate.cc",
     "feature/mock_ime_feature_delegate.h",
-    "feature/mock_navigation_feature_delegate.cc",
-    "feature/mock_navigation_feature_delegate.h",
     "feature/mock_render_widget_feature_delegate.cc",
     "feature/mock_render_widget_feature_delegate.h",
     "session/test_client_session.cc",
     "session/test_client_session.h",
   ]
 
   deps = [
     ":session",
     "//skia",
     "//testing/gmock",
@@ skipping 49 matching lines @@
     "//blimp/common/proto",
     "//skia",
   ]
 }
 
 source_set("feature_unit_tests") {
   testonly = true
 
   sources = [
     "feature/compositor/blimp_compositor_manager_unittest.cc",
-    "feature/navigation_feature_unittest.cc",
     "feature/render_widget_feature_unittest.cc",
     "feature/tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":compositor",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//blimp/client/core/compositor",
@@ skipping 40 matching lines @@
       # TODO(khushalsagar|scottmg): Remove this dependency from browser to
       # blink. See https://crbug.com/608114.
       "//third_party/WebKit/public:blink",
       "//ui/events/platform/x11",
       "//ui/platform_window",
       "//ui/platform_window/x11",
     ]
 
     public_configs = [ "//build/config/linux:x11" ]
     public_deps = [
+      "//blimp/client/core/contents",
       "//ui/events/platform/x11",
     ]
   }
 }
 
 if (is_android) {
   declare_args() {
     # Package name used in the manifest for the Blimp APK.
     blimp_package_name = "org.chromium.blimp"
   }
@@ skipping 135 matching lines @@
       "//base:base_java_test_support",
       "//blimp/client/core:settings_java",
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/public:public_headers_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/contents/BlimpContentsTest.java",
       "app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java",
       "app/android/javatests/src/org/chromium/blimp/core/settings/MockPreferences.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/client/core/contents",
       "//blimp/client/core/session:session",
       "//blimp/client/public:public_headers",
       "//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",
       "//ui/gl",
       "//url:url",
     ]
 
     sources = [
@@ skipping 37 matching lines @@
   instrumentation_test_apk("blimp_test_apk") {
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     android_manifest_dep = ":blimp_test_apk_manifest"
     deps = [
       ":blimp_test_java",
     ]
   }
 }