Revert "Remove webkit_glue::BuildUserAgent(), change the contract in webkit_glue"

content/common/child_thread.cc

 // Copyright (c) 2011 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 "content/common/child_thread.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/command_line.h"
 #include "content/common/child_process.h"
@@ skipping 23 matching lines @@
 
 ChildThread::ChildThread(const std::string& channel_name)
     : channel_name_(channel_name) {
   Init();
 }
 
 void ChildThread::Init() {
   check_with_browser_before_shutdown_ = false;
   on_channel_error_called_ = false;
   message_loop_ = MessageLoop::current();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
+    webkit_glue::SetUserAgent(
+        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+            switches::kUserAgent));
+  }
+
   channel_.reset(new IPC::SyncChannel(channel_name_,
       IPC::Channel::MODE_CLIENT, this,
       ChildProcess::current()->io_message_loop_proxy(), true,
       ChildProcess::current()->GetShutDownEvent()));
 #ifdef IPC_MESSAGE_LOG_ENABLED
   IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
 
   resource_dispatcher_.reset(new ResourceDispatcher(this));
   socket_stream_dispatcher_.reset(new SocketStreamDispatcher());
@@ skipping 159 matching lines @@
     MessageLoop::current()->Quit();
     return;
   }
 
   // The child process shutdown sequence is a request response based mechanism,
   // where we send out an initial feeler request to the child process host
   // instance in the browser to verify if it's ok to shutdown the child process.
   // The browser then sends back a response if it's ok to shutdown.
   Send(new ChildProcessHostMsg_ShutdownRequest);
 }