Blimp: add support for SSL connections.

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 6029cd0b8b5674ae3e70af9e1a079b59609a517c..1bb9d50c9abfb24b12b9b25ab017d8cab058179a 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -27,6 +27,7 @@ source_set("blimp_client") {
   defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ]
 
   public_deps = [
+    "//components/safe_json",
     "//ui/events",
   ]
 
@@ -49,12 +50,6 @@ source_set("blimp_client_unit_tests") {
 
   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",
@@ -63,6 +58,19 @@ source_set("blimp_client_unit_tests") {
     "//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" ]

[Wez, 2016/03/02 02:26:44]

Is this sufficient to get the correct test-isolate dependency on the PEM file?

[Kevin M, 2016/03/02 18:05:33]

I *think* so? remoting_unittests uses "data" for its cert file deps.

+  }
 }
 
 source_set("app_unit_tests") {
@@ -341,6 +349,7 @@ if (is_android) {
       "//base",
       "//blimp/common/proto",
       "//blimp/net:blimp_net",
+      "//components/safe_json/android:safe_json_jni_headers",
       "//skia",
       "//ui/gfx/geometry",
       "//ui/gl",
@@ -374,6 +383,7 @@ if (is_android) {
       ":blimp_java",
       ":blimp_java_resources",
       "//base:base_java",
+      "//components/safe_json/android:safe_json_java",
       "//net/android:net_java",
       google_play_services_resources,
     ]