Move blimp AssignmentSource to core

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/assignment_source.cc",
-    "session/assignment_source.h",
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
   ]
 
   public_deps = [
     ":feature",
     "//blimp/client/core:switches",
-    "//components/safe_json",
     "//ui/events",
   ]
 
   deps = [
     ":compositor",
     "//base",
+    "//blimp/client/core/session",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//net",
     "//ui/gfx/geometry",
     "//url:url",
   ]
 }
 
 source_set("client") {
@@ skipping 25 matching lines @@
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl/init",
     "//url:url",
   ]
 }
 
-source_set("blimp_client_unit_tests") {
-  testonly = true
-
-  sources = []
-
-  deps = [
-    ":client",
-    ":session",
-    "//base",
-    "//base/test:test_support",
-    "//blimp/client/core:switches",
-    "//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 += [
-      "//blimp/common",
-      "//blimp/common:test_support",
-      "//components/safe_json:test_support",
-      "//net:test_support",
-    ]
-    data += [
-      "session/test_selfsigned_cert.pem",
-      "//blimp/test/data/test_client_token",
-    ]
-  }
-}
-
 source_set("app_unit_tests") {
   testonly = true
 
   sources = [
     "app/blimp_discardable_memory_allocator_unittest.cc",
   ]
 
   deps = [
     ":client",
     "//base",
@@ skipping 158 matching lines @@
       "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 = [
       ":client",
       "//base",
       "//blimp/client:compositor",
+      "//blimp/client/core/session",
       "//blimp/net",
       "//net",
       "//services/shell/public/cpp",
 
       # TODO(khushalsagar|scottmg): Remove this dependency from browser to
       # blink. See https://crbug.com/608114.
       "//third_party/WebKit/public:blink",
       "//ui/events/platform/x11",
       "//ui/platform_window",
       "//ui/platform_window/x11",
@@ skipping 95 matching lines @@
       "values-sw/android_blimp_strings.xml",
       "values-th/android_blimp_strings.xml",
       "values-tr/android_blimp_strings.xml",
       "values-uk/android_blimp_strings.xml",
       "values-vi/android_blimp_strings.xml",
       "values-zh-rCN/android_blimp_strings.xml",
       "values-zh/android_blimp_strings.xml",
     ]
   }
 
-  java_cpp_enum("blimp_java_enums_srcjar") {
-    sources = [
-      "session/assignment_source.h",
-    ]
-  }
-
   android_library("blimp_java") {
-    srcjar_deps = [ ":blimp_java_enums_srcjar" ]
-
     deps = [
       ":blimp_java_resources",
       "//base:base_java",
       "//blimp/client/core:core_java",
       "//blimp/client/public:public_headers_java",
 
       # TODO(dtrainor): Remove the ui_java target once no more Android Toast
       # notifications are used.
       "//ui/android:ui_java",
       google_play_services_library,
@@ skipping 12 matching lines @@
       "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java",
       "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
       "app/android/java/src/org/chromium/blimp/session/EngineInfo.java",
       "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
       "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java",
       "app/android/java/src/org/chromium/blimp/settings/Preferences.java",
       "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
       "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java",
       "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
     ]
+
+    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/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/BlimpNativeInstrumentationTestCase.java",
     ]
   }
 
   shared_library("blimp_client_android") {
     deps = [
       ":client",
       ":jni_headers",
       "//base",
       "//blimp/client:compositor",
       "//blimp/client/core",
+      "//blimp/client/core/session:session",
       "//blimp/client/public:public_headers",
       "//blimp/common",
       "//blimp/common/proto",
       "//blimp/net",
       "//components/safe_json/android:safe_json_jni_headers",
       "//components/url_formatter",
       "//components/version_info",
       "//net",
       "//skia",
       "//ui/base/ime:text_input_types",
@@ skipping 43 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",
     ]
   }
 }