Revert of Blimp: add support for SSL connections.

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") {
   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",
     "blimp_client_export.h",
     "session/assignment_source.cc",
     "session/assignment_source.h",
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
   ]
 
   defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ]
 
   public_deps = [
-    "//components/safe_json",
     "//ui/events",
   ]
 
   deps = [
     ":feature",
     "//base",
     "//blimp/common/proto",
     "//blimp/net:blimp_net",
     "//cc",
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//url:url",
   ]
 }
 
 source_set("blimp_client_unit_tests") {
   testonly = true
 
   sources = []
 
+  # 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_client",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//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 = [
@@ skipping 259 matching lines @@
   }
 
   shared_library("blimp_client_android") {
     deps = [
       ":blimp_client",
       ":feature",
       ":jni_headers",
       "//base",
       "//blimp/common/proto",
       "//blimp/net:blimp_net",
-      "//components/safe_json/android:safe_json_jni_headers",
       "//skia",
       "//ui/gfx/geometry",
       "//ui/gl",
       "//url:url",
     ]
 
     sources = [
       "app/android/blimp_client_session_android.cc",
       "app/android/blimp_client_session_android.h",
       "app/android/blimp_compositor_manager_android.cc",
@@ skipping 13 matching lines @@
     libs = [ "android" ]
   }
 
   android_apk("blimp_apk") {
     deps = [
       ":blimp_apk_manifest",
       ":blimp_client_android",
       ":blimp_java",
       ":blimp_java_resources",
       "//base:base_java",
-      "//components/safe_json/android:safe_json_java",
       "//net/android:net_java",
       google_play_services_resources,
     ]
     apk_name = "Blimp"
     android_manifest = blimp_apk_manifest
     native_libs = [ "libblimp_client_android.so" ]
   }
 
   instrumentation_test_apk("blimp_test_apk") {
     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,
     ]
   }
 }