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

10 files changed, 50 insertions, 32 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 =
diff --git a/chrome/common/child_process.cc b/chrome/common/child_process.cc
index 50f8b88..979418f 100644
--- a/chrome/common/child_process.cc
+++ b/chrome/common/child_process.cc
@@ -3,10 +3,15 @@
 // found in the LICENSE file.
 
 #include <windows.h>
+
 #include "chrome/common/child_process.h"
 
 #include "base/atomic_ref_count.h"
 #include "base/basictypes.h"
+#include "base/command_line.h"
+#include "base/string_util.h"
+#include "chrome/common/chrome_switches.h"
+#include "webkit/glue/webkit_glue.h"
 
 ChildProcess* ChildProcess::child_process_;
 MessageLoop* ChildProcess::main_thread_loop_;
@@ -72,6 +77,13 @@ bool ChildProcess::GlobalInit(const std::wstring &channel_name,
   shutdown_event_ = CreateEvent(NULL, TRUE, FALSE, NULL);
 
   child_process_ = factory->Create(channel_name);
+
+  CommandLine command_line;
+  if (command_line.HasSwitch(switches::kUserAgent)) {
+    webkit_glue::SetUserAgent(WideToUTF8(
+        command_line.GetSwitchValue(switches::kUserAgent)));
+  }
+
   return true;
 }
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 7dec663..742eee1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -128,6 +128,9 @@ const wchar_t kDomAutomationController[]       = L"dom-automation";
 // Tells the plugin process the path of the plugin to load
 const wchar_t kPluginPath[]                    = L"plugin-path";
 
+// A string used to override the default user agent with a custom one.
+const wchar_t kUserAgent[]                     = L"user-agent";
+
 // Specifies the flags passed to JS engine
 const wchar_t kJavaScriptFlags[]               = L"js-flags";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 241170e8..9df559b 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -43,6 +43,7 @@ extern const wchar_t kApp[];
 extern const wchar_t kAppUploadFile[];
 extern const wchar_t kDomAutomationController[];
 extern const wchar_t kPluginPath[];
+extern const wchar_t kUserAgent[];
 extern const wchar_t kJavaScriptFlags[];
 extern const wchar_t kGeoID[];
 extern const wchar_t kLang[];
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 7deb5dc..95268a0 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -1443,35 +1443,33 @@ struct ParamTraits<WebPreferences> {
     WriteParam(m, p.java_enabled);
     WriteParam(m, p.user_style_sheet_enabled);
     WriteParam(m, p.user_style_sheet_location);
-    WriteParam(m, p.user_agent);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
-      ReadParam(m, iter, &p->standard_font_family) &&
-      ReadParam(m, iter, &p->fixed_font_family) &&
-      ReadParam(m, iter, &p->serif_font_family) &&
-      ReadParam(m, iter, &p->sans_serif_font_family) &&
-      ReadParam(m, iter, &p->cursive_font_family) &&
-      ReadParam(m, iter, &p->fantasy_font_family) &&
-      ReadParam(m, iter, &p->default_font_size) &&
-      ReadParam(m, iter, &p->default_fixed_font_size) &&
-      ReadParam(m, iter, &p->minimum_font_size) &&
-      ReadParam(m, iter, &p->minimum_logical_font_size) &&
-      ReadParam(m, iter, &p->default_encoding) &&
-      ReadParam(m, iter, &p->javascript_enabled) &&
-      ReadParam(m, iter, &p->javascript_can_open_windows_automatically) &&
-      ReadParam(m, iter, &p->loads_images_automatically) &&
-      ReadParam(m, iter, &p->plugins_enabled) &&
-      ReadParam(m, iter, &p->dom_paste_enabled) &&
-      ReadParam(m, iter, &p->developer_extras_enabled) &&
-      ReadParam(m, iter, &p->shrinks_standalone_images_to_fit) &&
-      ReadParam(m, iter, &p->uses_universal_detector) &&
-      ReadParam(m, iter, &p->text_areas_are_resizable) &&
-      ReadParam(m, iter, &p->dashboard_compatibility_mode) &&
-      ReadParam(m, iter, &p->java_enabled) &&
-      ReadParam(m, iter, &p->user_style_sheet_enabled) &&
-      ReadParam(m, iter, &p->user_style_sheet_location) &&
-      ReadParam(m, iter, &p->user_agent);
+        ReadParam(m, iter, &p->standard_font_family) &&
+        ReadParam(m, iter, &p->fixed_font_family) &&
+        ReadParam(m, iter, &p->serif_font_family) &&
+        ReadParam(m, iter, &p->sans_serif_font_family) &&
+        ReadParam(m, iter, &p->cursive_font_family) &&
+        ReadParam(m, iter, &p->fantasy_font_family) &&
+        ReadParam(m, iter, &p->default_font_size) &&
+        ReadParam(m, iter, &p->default_fixed_font_size) &&
+        ReadParam(m, iter, &p->minimum_font_size) &&
+        ReadParam(m, iter, &p->minimum_logical_font_size) &&
+        ReadParam(m, iter, &p->default_encoding) &&
+        ReadParam(m, iter, &p->javascript_enabled) &&
+        ReadParam(m, iter, &p->javascript_can_open_windows_automatically) &&
+        ReadParam(m, iter, &p->loads_images_automatically) &&
+        ReadParam(m, iter, &p->plugins_enabled) &&
+        ReadParam(m, iter, &p->dom_paste_enabled) &&
+        ReadParam(m, iter, &p->developer_extras_enabled) &&
+        ReadParam(m, iter, &p->shrinks_standalone_images_to_fit) &&
+        ReadParam(m, iter, &p->uses_universal_detector) &&
+        ReadParam(m, iter, &p->text_areas_are_resizable) &&
+        ReadParam(m, iter, &p->dashboard_compatibility_mode) &&
+        ReadParam(m, iter, &p->java_enabled) &&
+        ReadParam(m, iter, &p->user_style_sheet_enabled) &&
+        ReadParam(m, iter, &p->user_style_sheet_location);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<WebPreferences>");