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

content/shell/shell_main_delegate.cc

 // Copyright (c) 2012 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_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_plugin_client.h"
 #include "content/shell/shell_content_renderer_client.h"
 #include "content/shell/shell_content_utility_client.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "webkit/glue/user_agent.h"
 
 #if defined(OS_MACOSX)
 #include "content/shell/paths_mac.h"
 #endif  // OS_MACOSX
 
 ShellMainDelegate::ShellMainDelegate() {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
 #if defined(OS_MACOSX)
   OverrideFrameworkBundlePath();
 #endif
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
 #if defined(OS_MACOSX)
   OverrideChildProcessPath();
 #endif  // OS_MACOSX
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
-  content::SetContentClient(&content_client_);
+  // The "19" is so that sites that sniff for version think that this is
+  // something reasonably current; the "77.34.5" is a hint that this isn't a
+  // standard Chrome.
+  std::string user_agent =
+      webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5");
+
+  content::Initialize(&content_client_, user_agent);
   InitializeShellContentClient(process_type);
 
   InitializeResourceBundle();
 }
 
 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) {
 }
 
 int ShellMainDelegate::RunProcess(
     const std::string& process_type,
@@ skipping 57 matching lines @@
   FilePath pak_file;
 #if defined(OS_MACOSX)
   pak_file = GetResourcesPakFilePath();
 #else
   FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
 }