Set the user agent for 0.6

blimp/client/core/settings/settings_feature.cc

Index: blimp/client/core/settings/settings_feature.cc
diff --git a/blimp/client/core/settings/settings_feature.cc b/blimp/client/core/settings/settings_feature.cc
index e669415cca02fa1e8b321996ac588e7d404ede3e..bd6ccf6f89d1d57dc06bbadbd2e09062a8b707d8 100644
--- a/blimp/client/core/settings/settings_feature.cc
+++ b/blimp/client/core/settings/settings_feature.cc
@@ -5,6 +5,7 @@
 #include "blimp/client/core/settings/settings_feature.h"
 
 #include "blimp/client/core/settings/settings.h"
+#include "blimp/client/core/settings/user_agent.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/settings.pb.h"
@@ -13,7 +14,9 @@
 namespace blimp {
 namespace client {
 
-SettingsFeature::SettingsFeature(Settings* settings) : settings_(settings) {}
+SettingsFeature::SettingsFeature(Settings* settings) : settings_(settings) {
+  DCHECK(settings_);
+}
 
 SettingsFeature::~SettingsFeature() = default;
 
@@ -22,16 +25,6 @@ void SettingsFeature::set_outgoing_message_processor(
   outgoing_message_processor_ = std::move(processor);
 }
 
-// TODO(mlliu): remove this method once we set the user agent in PushSettings()
-// http://crbug.com/652032.
-void SettingsFeature::SendUserAgentOSVersionInfo(const std::string& osVersion) {
-  EngineSettingsMessage* engine_settings;
-  std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&engine_settings);
-  engine_settings->set_client_os_info(osVersion);
-  outgoing_message_processor_->ProcessMessage(std::move(message),
-                                              net::CompletionCallback());
-}
-
 void SettingsFeature::ProcessMessage(std::unique_ptr<BlimpMessage> message,
                                      const net::CompletionCallback& callback) {
   // We don't receive any messages from the engine yet.
@@ -48,12 +41,11 @@ void SettingsFeature::OnRecordWholeDocumentChanged(bool enable) {
 }
 
 void SettingsFeature::PushSettings() {
-  // TODO(mlliu): set the user agent on the proto as well after moving
-  // blimp/client/app/user_agent.* to this directory (http://crbug.com/652032).
   EngineSettingsMessage* engine_settings;
   std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&engine_settings);
   engine_settings->set_record_whole_document(
       settings_->IsRecordWholeDocument());
+  engine_settings->set_client_os_info(GetOSVersionInfoForUserAgent());
   outgoing_message_processor_->ProcessMessage(std::move(message),
                                               net::CompletionCallback());
 }