Move session into //blimp/client/app and update GN files.

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/*" ]
+  visibility = [
+    "//blimp/client/app:*",  # TODO(nyquist): Remove this. See crbug/651964.
+    "//blimp/client/core/*",
+  ]
 
   sources = [
     "blimp_contents_impl.cc",
     "blimp_contents_impl.h",
     "blimp_contents_manager.cc",
     "blimp_contents_manager.h",
     "blimp_contents_view_impl.cc",
     "blimp_contents_view_impl.h",
     "blimp_navigation_controller_delegate.h",
     "blimp_navigation_controller_impl.cc",
@@ skipping 53 matching lines @@
     ]
   } else {
     sources += [
       "blimp_contents_view_impl_aura.cc",
       "blimp_contents_view_impl_aura.h",
     ]
   }
 }
 
 source_set("test_support") {
+  visibility = [
+    "//blimp/engine:browser_tests",
+    "//blimp/client/core/contents:unit_tests",
+  ]
+
   testonly = true
 
   sources = [
     "fake_navigation_feature.cc",
     "fake_navigation_feature.h",
     "mock_ime_feature_delegate.cc",
     "mock_ime_feature_delegate.h",
     "mock_navigation_feature_delegate.cc",
     "mock_navigation_feature_delegate.h",
   ]
@@ skipping 41 matching lines @@
     "//url",
   ]
 
   if (is_android) {
     deps += [ "//ui/android" ]
   }
 }
 
 if (is_android) {
   android_library("contents_java") {
-    visibility = [ "//blimp/client/*" ]
+    visibility = [
+      "//blimp/client/app:*",  # TODO(nyquist): Remove this. See crbug/651964.
+      "//blimp/client/core/*",
+    ]
 
     java_files = [
       "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/ImeEditText.java",
       "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java",
     ]
 
     deps = [
       "//base:base_java",
-      "//blimp/client:blimp_java_resources",
+      "//blimp/client/app:blimp_java_resources",
       "//blimp/client/public:public_headers_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//ui/android:ui_java",
     ]
   }
 
   generate_jni("jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
       "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"
   }
 }