Add assigner support to Blimp

blimp/client/app/android/blimp_client_session_android.cc

 // 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.
 
 #include "blimp/client/app/android/blimp_client_session_android.h"
 
+#include "base/android/jni_string.h"
 #include "base/thread_task_runner_handle.h"
 #include "blimp/client/feature/tab_control_feature.h"
 #include "blimp/client/session/assignment_source.h"
 #include "jni/BlimpClientSession_jni.h"
 
 namespace blimp {
 namespace client {
 namespace {
 const int kDummyTabId = 0;
 }  // namespace
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
-  scoped_ptr<AssignmentSource> assignment_source = make_scoped_ptr(
-      new AssignmentSource(base::ThreadTaskRunnerHandle::Get()));
-  return reinterpret_cast<intptr_t>(
-      new BlimpClientSessionAndroid(env, jobj, std::move(assignment_source)));
+  return reinterpret_cast<intptr_t>(new BlimpClientSessionAndroid(env, jobj));
 }
 
 // static
 bool BlimpClientSessionAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 BlimpClientSessionAndroid* BlimpClientSessionAndroid::FromJavaObject(
     JNIEnv* env,
     jobject jobj) {
   return reinterpret_cast<BlimpClientSessionAndroid*>(
       Java_BlimpClientSession_getNativePtr(env, jobj));
 }
 
 BlimpClientSessionAndroid::BlimpClientSessionAndroid(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& jobj,
-    scoped_ptr<AssignmentSource> assignment_source)
-    : BlimpClientSession(std::move(assignment_source)) {
+    const base::android::JavaParamRef<jobject>& jobj) {
   java_obj_.Reset(env, jobj);
 
   // Create a single tab's WebContents.
   // TODO(kmarshall): Remove this once we add tab-literacy to Blimp.
   GetTabControlFeature()->CreateTab(kDummyTabId);
 }
 
 void BlimpClientSessionAndroid::Connect(
     JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& jobj) {
-  BlimpClientSession::Connect();
+    const base::android::JavaParamRef<jobject>& jobj,
+    const base::android::JavaParamRef<jstring>& jtoken) {
+  std::string token;
+  if (jtoken.obj())
+    token = base::android::ConvertJavaStringToUTF8(env, jtoken);
+
+  BlimpClientSession::Connect(token);
 }
 
 BlimpClientSessionAndroid::~BlimpClientSessionAndroid() {}
 
 void BlimpClientSessionAndroid::Destroy(JNIEnv* env,
                                         const JavaParamRef<jobject>& jobj) {
   delete this;
 }
 
+void BlimpClientSessionAndroid::ConnectWithAssignment(

[Kevin M, 2016/02/12 19:45:26]

I think that subclassing this method obfuscates the call flow within
BlimpEngineSession.

I would prefer a virtual OnXXX method, or an observer, with a name that
explicitly declares its intention to observe connect events.

[David Trainor- moved to gerrit, 2016/02/17 21:09:47]

Good point.  Done :).

+    AssignmentSourceResult result,
+    const Assignment& assignment) {
+  // Notify the front end of the assignment result.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_BlimpClientSession_onAssignmentReceived(env, java_obj_.obj(),
+                                               static_cast<jint>(result));
+
+  BlimpClientSession::ConnectWithAssignment(result, assignment);
+}
+
 }  // namespace client
 }  // namespace blimp