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

chrome/app/chrome_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 "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 18 matching lines @@
 #include "chrome/plugin/chrome_content_plugin_client.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/utility/chrome_content_utility_client.h"
 #include "content/common/content_counters.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
+#include "webkit/glue/user_agent.h"
 
 #if defined(OS_WIN)
 #include <algorithm>
 #include <atlbase.h>
 #include <malloc.h>
 #include "base/string_util.h"
 #include "base/win/registry.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "policy/policy_constants.h"
 #include "sandbox/src/sandbox.h"
@@ skipping 488 matching lines @@
   if (IsCrashReporterEnabled())
     InitCrashProcessInfo();
 }
 #endif  // defined(OS_MACOSX)
 
 void ChromeMainDelegate::PreSandboxStartup() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
+  // Construct our user agent string.
+  chrome::VersionInfo version_info;
+  std::string product("Chrome/");
+  product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
+  std::string user_agent = webkit_glue::BuildUserAgentFromProduct(product);

[scherkus (not reviewing), 2012/04/05 23:20:45]

FYI this code was moved here instead of chrome_content_client.cc

+
   // Initialize the content client which that code uses to talk to Chrome.
-  content::SetContentClient(&chrome_content_client_);
+  content::Initialize(&chrome_content_client_, user_agent);
   InitializeChromeContentClient(process_type);

[Dirk Pranke, 2012/04/05 23:35:54]

Nit: does it make sense to change this to something like
 InitializeChromeContentClient(&chrome_content_client_, process_type) and call
content::Initialize() from there?. It's a little weird to see
content::Initialize() followed by InitializeChromeContentClient().

[scherkus (not reviewing), 2012/04/05 23:58:33]

Agreed but will wait to hear back on jam on which way we should proceed with the
API changes

 
   // Initialize the Chrome path provider.
   chrome::RegisterPathProvider();
 
 #if defined(OS_MACOSX)
   // On the Mac, the child executable lives at a predefined location within
   // the app bundle's versioned directory.
   PathService::Override(content::CHILD_PROCESS_EXE,
                         chrome::GetVersionedDirectory().
                         Append(chrome::kHelperProcessExecutablePath));
@@ skipping 176 matching lines @@
 
 #if defined(USE_LINUX_BREAKPAD)
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   InitCrashReporter();
 #endif
 
   InitializeChromeContentClient(process_type);
 }
 #endif  // OS_MACOSX