Cleanup blimp/client/core code organization.

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 = [
     "//blimp/client/core",
-    "//blimp/client/core:switches",
     "//blimp/client/core/geolocation",
+    "//blimp/client/core/switches",
     "//blimp/common/proto",
     "//device/geolocation",
     "//ui/events",
   ]
 
   deps = [
     "//base",
     "//blimp/client/core/compositor",
     "//blimp/client/core/contents",
     "//blimp/client/core/render_widget",
@@ skipping 13 matching lines @@
     "app/blimp_discardable_memory_allocator.cc",
     "app/blimp_discardable_memory_allocator.h",
     "app/blimp_startup.cc",
     "app/blimp_startup.h",
     "app/compositor/browser_compositor.cc",
     "app/compositor/browser_compositor.h",
   ]
 
   public_deps = [
     ":session",
-    "//blimp/client/core:switches",
     "//blimp/client/core/compositor",
+    "//blimp/client/core/switches",
     "//blimp/client/support",
     "//cc",
     "//cc/surfaces",
     "//components/safe_json",
     "//components/url_formatter",
     "//skia",
     "//ui/events",
     "//ui/gfx/geometry",
   ]
 
@@ skipping 212 matching lines @@
     ]
   }
 
   android_library("blimp_test_java") {
     testonly = true
 
     deps = [
       ":blimp_java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//blimp/client/core:common_java",
+      "//blimp/client/core/common:common_java",
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/core/settings:settings_java",
       "//blimp/client/public:public_headers_java",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//ui/android:ui_java",
       google_play_services_library,
     ]
 
@@ skipping 68 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",
     ]
   }
 }