Tidy up Android's is-tablet functionality.

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 420 matching lines @@
   }
   return false;
 }
 
 std::string ChromeContentClient::GetUserAgent() const {
   chrome::VersionInfo version_info;
   std::string product("Chrome/");
   product += version_info.is_valid() ? version_info.Version() : "0.0.0.0";
 #if defined(OS_ANDROID)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kTabletUi)) {
+  if (!command_line->HasSwitch(switches::kUseMobileUserAgent)) {

[gone, 2012/07/25 18:56:09]

The conditional is flipped here.

[benm (inactive), 2012/07/26 09:43:36]

ah shoot! Thanks for spotting, sorry for merge pain :(

     product += " Mobile";
   }
 #endif
   return webkit_glue::BuildUserAgentFromProduct(product);
 }
 
 string16 ChromeContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
@@ skipping 91 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome