Add a full Blimp integration test.

blimp/client/core/contents/BUILD.gn

 # Copyright 2016 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.
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 source_set("contents") {
   visibility = [ "//blimp/client/*" ]
 
   sources = [
     "blimp_contents_impl.cc",
     "blimp_contents_impl.h",
     "blimp_contents_manager.cc",
     "blimp_contents_manager.h",
-    "blimp_contents_view.h",
+    "blimp_contents_view_impl.cc",
+    "blimp_contents_view_impl.h",
     "blimp_navigation_controller_delegate.h",
     "blimp_navigation_controller_impl.cc",
     "blimp_navigation_controller_impl.h",
     "ime_feature.cc",
     "ime_feature.h",
     "navigation_feature.cc",
     "navigation_feature.h",
     "tab_control_feature.cc",
     "tab_control_feature.h",
   ]
@@ skipping 24 matching lines @@
       "android/blimp_contents_jni_registrar.cc",
       "android/blimp_contents_jni_registrar.h",
       "android/blimp_contents_observer_proxy.cc",
       "android/blimp_contents_observer_proxy.h",
       "android/blimp_navigation_controller_impl_android.cc",
       "android/blimp_navigation_controller_impl_android.h",
       "android/blimp_view.cc",
       "android/blimp_view.h",
       "android/ime_helper_dialog.cc",
       "android/ime_helper_dialog.h",
-      "blimp_contents_view_android.cc",
-      "blimp_contents_view_android.h",
+      "blimp_contents_view_impl_android.cc",
+      "blimp_contents_view_impl_android.h",
     ]
 
     public_deps += [ "//ui/android" ]
 
     deps += [
       ":jni_headers",
       "//cc",
       "//ui/android",
       "//ui/events:events",
     ]
   } else {
     sources += [
-      "blimp_contents_view_aura.cc",
-      "blimp_contents_view_aura.h",
+      "blimp_contents_view_impl_aura.cc",
+      "blimp_contents_view_impl_aura.h",
     ]
   }
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
     "fake_navigation_feature.cc",
     "fake_navigation_feature.h",
@@ skipping 27 matching lines @@
     "blimp_navigation_controller_impl_unittest.cc",
     "navigation_feature_unittest.cc",
     "tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":contents",
     ":test_support",
     "//base",
     "//blimp/client/public:public_headers",
-    "//blimp/client/support:test_support",
+    "//blimp/client/test",
     "//blimp/common",
     "//blimp/net:test_support",
     "//net",
     "//net:test_support",
     "//testing/gtest",
     "//ui/gfx:native_widget_types",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry:geometry",
     "//url",
   ]
@@ skipping 32 matching lines @@
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
       "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java",
     ]
 
     jni_package = "blimp/client/core/contents"
   }
 }