Set the user agent for 0.6

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 <string>
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "blimp/client/app/user_agent.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/core/session/assignment_source.h"
 #include "blimp/client/core/settings/settings_feature.h"
 #include "blimp/net/blimp_stats.h"
 #include "components/version_info/version_info.h"
 #include "jni/BlimpClientSession_jni.h"
 #include "net/base/net_errors.h"
 #include "ui/android/window_android.h"
 
 namespace blimp {
@@ skipping 37 matching lines @@
     jlong window_android_ptr)
     : BlimpClientSession(CreateAssignerGURL(
           base::android::ConvertJavaStringToUTF8(jassigner_url))) {
   java_obj_.Reset(env, jobj);
 
   ui::WindowAndroid* window =
       reinterpret_cast<ui::WindowAndroid*>(window_android_ptr);
   ime_dialog_.reset(new ImeHelperDialog(window));
   GetImeFeature()->set_delegate(ime_dialog_.get());
 
-  // Send OS info before creating any tab.
-  GetSettingsFeature()->SendUserAgentOSVersionInfo(
-      GetOSVersionInfoForUserAgent());
+  // Send the necessary settings to the engine before creating any tab.
+  GetSettingsFeature()->PushSettings();
 
   // 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,
     const base::android::JavaParamRef<jstring>& jclient_auth_token) {
@@ skipping 50 matching lines @@
     const base::android::JavaParamRef<jobject>& jobj) {
   BlimpStats* stats = BlimpStats::GetInstance();
   int metrics[] = {stats->Get(BlimpStats::BYTES_RECEIVED),
                    stats->Get(BlimpStats::BYTES_SENT),
                    stats->Get(BlimpStats::COMMIT)};
   return base::android::ToJavaIntArray(env, metrics, arraysize(metrics));
 }
 
 }  // namespace client
 }  // namespace blimp