Simplify GN target names for //blimp

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("blimp_client") {
+source_set("client") {
   sources = [
     "app/blimp_client_switches.cc",
     "app/blimp_client_switches.h",
     "app/blimp_discardable_memory_allocator.cc",
     "app/blimp_discardable_memory_allocator.h",
     "app/blimp_startup.cc",
     "app/blimp_startup.h",
     "session/assignment_source.cc",
     "session/assignment_source.h",
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
   ]
 
   public_deps = [
     "//components/safe_json",
     "//components/url_formatter",
     "//ui/events",
   ]
 
   deps = [
     ":feature",
     "//base",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//cc",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//url:url",
   ]
 }
 
 source_set("blimp_client_unit_tests") {
   testonly = true
 
   sources = []
 
   deps = [
-    ":blimp_client",
+    ":client",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   data = []
 
   # TODO(dtrainor): Fix the test harness to allow this to run on Android.
   # See crbug.com/588240.
   if (is_linux) {
     sources += [ "session/assignment_source_unittest.cc" ]
     deps += [
       "//components/safe_json:test_support",
       "//net:test_support",
     ]
     data += [ "session/test_selfsigned_cert.pem" ]
   }
 }
 
 source_set("app_unit_tests") {
   testonly = true
 
   sources = [
     "app/blimp_discardable_memory_allocator_unittest.cc",
   ]
 
   deps = [
-    ":blimp_client",
+    ":client",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("feature") {
   sources = [
@@ skipping 21 matching lines @@
     "feature/navigation_feature.h",
     "feature/render_widget_feature.cc",
     "feature/render_widget_feature.h",
     "feature/settings_feature.cc",
     "feature/settings_feature.h",
     "feature/tab_control_feature.cc",
     "feature/tab_control_feature.h",
   ]
 
   deps = [
-    "//blimp/common:blimp_common",
-    "//blimp/net:blimp_net",
+    "//blimp/common",
+    "//blimp/net",
     "//cc",
     "//cc/proto",
     "//components/url_formatter",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gl_in_process_context",
     "//gpu/command_buffer/client:gles2_c_lib",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/common:gles2_utils",
     "//gpu/skia_bindings",
     "//net",
@@ skipping 19 matching lines @@
     "feature/navigation_feature_unittest.cc",
     "feature/render_widget_feature_unittest.cc",
     "feature/tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":feature",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
-    "//blimp/common:blimp_common",
+    "//blimp/common",
     "//blimp/common/proto",
-    "//blimp/net:blimp_net",
+    "//blimp/net",
     "//blimp/net:test_support",
     "//cc/proto",
     "//net",
     "//net:test_support",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/events:gesture_detection",
     "//ui/gfx/geometry",
   ]
 
   if (is_linux) {
     #TODO(khushalsagar): Run these tests for android.
     sources += [ "feature/compositor/blimp_compositor_unittest.cc" ]
   }
 }
 
 if (is_linux && !is_chromeos && use_x11) {
   executable("blimp_shell") {
     sources = [
       "app/linux/blimp_client_session_linux.cc",
       "app/linux/blimp_client_session_linux.h",
       "app/linux/blimp_display_manager.cc",
       "app/linux/blimp_display_manager.h",
       "app/linux/blimp_main.cc",
     ]
 
     deps = [
-      ":blimp_client",
+      ":client",
       ":feature",
       "//base",
-      "//blimp/net:blimp_net",
+      "//blimp/net",
       "//net",
       "//ui/events/platform/x11",
       "//ui/platform_window",
       "//ui/platform_window/x11",
     ]
 
     public_configs = [ "//build/config/linux:x11" ]
     public_deps = [
       "//ui/events/platform/x11",
     ]
@@ skipping 148 matching lines @@
     ]
 
     java_files = [
       "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
       "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
     ]
   }
 
   shared_library("blimp_client_android") {
     deps = [
-      ":blimp_client",
+      ":client",
       ":feature",
       ":jni_headers",
       "//base",
-      "//blimp/common:blimp_common",
+      "//blimp/common",
       "//blimp/common/proto",
-      "//blimp/net:blimp_net",
+      "//blimp/net",
       "//components/safe_json/android:safe_json_jni_headers",
       "//components/url_formatter",
       "//net",
       "//skia",
       "//ui/base/ime:text_input_types",
       "//ui/gfx/geometry",
       "//ui/gl",
       "//url:url",
     ]
 
@@ skipping 41 matching lines @@
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     deps = [
       ":blimp_test_apk_manifest",
       ":blimp_test_java",
       google_play_services_resources,
     ]
   }
 }