Cleanup blimp/client/core code organization.

blimp/engine/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/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/repack.gni")
@@ skipping 669 matching lines @@
     "browser_tests/waitable_content_pump.cc",
     "browser_tests/waitable_content_pump.h",
   ]
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
     "//base",
     "//blimp/client:session",
     "//blimp/client:test_support",
-    "//blimp/client/core:switches",
     "//blimp/client/core/contents:test_support",
     "//blimp/client/core/render_widget:test_support",
     "//blimp/client/core/session",
+    "//blimp/client/core/switches",
     "//blimp/client/test",
     "//blimp/common",
     "//blimp/engine:app",
     "//blimp/engine:app_config",
     "//blimp/engine:app_switches",
     "//blimp/engine:pak",
     "//blimp/engine:session",
     "//blimp/engine:test_support",
     "//blimp/net",
     "//content/public/app:both",
     "//content/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   data = [
     "//blimp/test/data/",
     "$root_out_dir/blimp_engine.pak",
   ]
 }