Move --user-agent overriding logic from chrome into content.

content/shell/shell_content_client.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/shell/shell_content_client.h"
 
 #include "base/string_piece.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 
@@ skipping 13 matching lines @@
 }
 
 void ShellContentClient::AddNPAPIPlugins(
     webkit::npapi::PluginList* plugin_list) {
 }
 
 bool ShellContentClient::CanHandleWhileSwappedOut(const IPC::Message& msg) {
   return false;
 }
 
-std::string ShellContentClient::GetUserAgent(bool* overriding) const {
-  *overriding = false;
+std::string ShellContentClient::GetUserAgent() const {
   return std::string("Chrome/15.16.17.18");
 }
 
 string16 ShellContentClient::GetLocalizedString(int message_id) const {
   return string16();
 }
 
 base::StringPiece ShellContentClient::GetDataResource(int resource_id) const {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }
 
 #if defined(OS_WIN)
 bool ShellContentClient::SandboxPlugin(CommandLine* command_line,
                                        sandbox::TargetPolicy* policy) {
   return false;
 }
 #endif
 
 #if defined(OS_MACOSX)
 bool ShellContentClient::GetSandboxProfileForSandboxType(
     int sandbox_type,
     int* sandbox_profile_resource_id) const {
   return false;
 }
 #endif
 
 }  // namespace content