Split //blimp/client/core to relevant parts.

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 390 matching lines @@
     srcjar_deps = [ "//blimp/client/core/session:java_enums_srcjar" ]
   }
 
   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/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/BlimpContentsTest.java",
+      "app/android/javatests/src/org/chromium/blimp/core/contents/BlimpContentsTest.java",
       "app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java",
     ]
   }
 
   shared_library("blimp_client_android") {
     deps = [
       ":client",
       ":jni_headers",
       "//base",
       "//blimp/client:compositor",
@@ skipping 55 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",
     ]
   }
 }