Allow the creation of partially spoofed user agents

chrome/common/chrome_content_client.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/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 412 matching lines @@
   // swapped out renderers.
   switch (msg.type()) {
     case ChromeViewHostMsg_Snapshot::ID:
       return true;
     default:
       break;
   }
   return false;
 }
 
-std::string ChromeContentClient::GetUserAgent() const {
+std::string ChromeContentClient::GetProduct(bool mobile_device) const {

[tony, 2012/08/24 19:46:17]

I like the rename to GetProduct, but do we need to pass in the bool? Can't we
just += " Mobile" in the #if below?

[gone, 2012/08/24 20:35:11]

Did it thinking that we might want to be able to create a mobile user agent in
the future, but I can't think of any cases where we actually need it at the
moment.  Moved that back down and simplified.

   chrome::VersionInfo version_info;
   std::string product("Chrome/");
   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
+  if (mobile_device) {
+    product += " Mobile";
+  }
+  return product;
+}
+
+std::string ChromeContentClient::GetUserAgent() const {
+  bool mobile_device = false;
 #if defined(OS_ANDROID)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kUseMobileUserAgent)) {
-    product += " Mobile";
-  }
+  mobile_device = command_line->HasSwitch(switches::kUseMobileUserAgent);
 #endif
+  std::string product = GetProduct(mobile_device);
   return webkit_glue::BuildUserAgentFromProduct(product);
 }
 
 string16 ChromeContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece ChromeContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
@@ skipping 88 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome