Add a command-line switch to change the user agent.BUG=757345

Review URL: http://codereview.chromium.org/4059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2571 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 6 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index f338dfa..4b8ac12 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -263,7 +263,7 @@ std::string BrowserAboutHandler::AboutVersion() {
       l10n_util::GetString(IDS_ABOUT_VERSION_UNOFFICIAL));
   }
   localized_strings.SetString(L"useragent",
-      UTF8ToWide(webkit_glue::GetDefaultUserAgent()));
+      UTF8ToWide(webkit_glue::GetUserAgent()));
 
   static const StringPiece version_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index e7437ce..859b94b 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -39,6 +39,7 @@
 #include "chrome/common/win_util.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_util.h"
+#include "webkit/glue/webkit_glue.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
@@ -407,6 +408,11 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile,
   if (parsed_command_line.HasSwitch(switches::kEnableFileCookies))
     net::CookieMonster::EnableFileScheme();
 
+  if (parsed_command_line.HasSwitch(switches::kUserAgent)) {
+    webkit_glue::SetUserAgent(WideToUTF8(
+        parsed_command_line.GetSwitchValue(switches::kUserAgent)));
+  }
+
 #ifndef NDEBUG
   if (parsed_command_line.HasSwitch(switches::kApp)) {
     NOTREACHED();
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 58bdc53..b3db5f1 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -343,6 +343,7 @@ bool PluginProcessHost::Init(const std::wstring& dll,
     switches::kNoSandbox,
     switches::kSafePlugins,
     switches::kTestSandbox,
+    switches::kUserAgent,
     switches::kDisableBreakpad,
     switches::kFullMemoryCrashReport,
     switches::kEnableLogging,
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 9ed5496..ad2ddb1 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -101,7 +101,7 @@ class ProfileImpl::RequestContext : public URLRequestContext,
     cookie_store_ = NULL;
 
     // setup user agent
-    user_agent_ = webkit_glue::GetDefaultUserAgent();
+    user_agent_ = webkit_glue::GetUserAgent();
     // set up Accept-Language and Accept-Charset header values
     // TODO(jungshik) : This may slow down http requests. Perhaps,
     // we have to come up with a better way to set up these values.
diff --git a/chrome/browser/render_process_host.cc b/chrome/browser/render_process_host.cc
index 34eba76..a1244ed 100644
--- a/chrome/browser/render_process_host.cc
+++ b/chrome/browser/render_process_host.cc
@@ -249,6 +249,7 @@ bool RenderProcessHost::Init() {
     switches::kTestSandbox,
     switches::kInProcessPlugins,
     switches::kDomAutomationController,
+    switches::kUserAgent,
     switches::kJavaScriptFlags,
     switches::kRecordMode,
     switches::kPlaybackMode,
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index b00d63f..35c55ad 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -1896,10 +1896,6 @@ WebPreferences WebContents::GetWebkitPrefs() {
   WebPreferences web_prefs;
   PrefService* prefs = profile()->GetPrefs();
 
-  // TODO(darin): Support overriding this value from prefs, which also
-  // involves modifying our URLRequestContext.
-  web_prefs.user_agent = webkit_glue::GetDefaultUserAgent();
-
   web_prefs.fixed_font_family =
       prefs->GetString(prefs::kWebKitFixedFontFamily);
   web_prefs.serif_font_family =