extensions: Append base:: in the StringPrintf calls.

(Note this is a TODO in string_util.h)

BUG=None
TEST=trybots

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

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

12 files changed, 45 insertions, 31 deletions

diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index ea874ad..1b0bbeb 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -10,6 +10,7 @@
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/singleton.h"
+#include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
@@ -171,7 +172,7 @@ void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
       !original_url_.SchemeIsFile() &&
       apps_require_extension_mime_type_ &&
       original_mime_type_ != Extension::kMimeType) {
-    ReportFailureFromFileThread(StringPrintf(
+    ReportFailureFromFileThread(base::StringPrintf(
         "Applications must be served with content type %s.",
         Extension::kMimeType));
     return;
@@ -192,7 +193,7 @@ void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
   // Make sure the expected id matches.
   // TODO(aa): Also support expected version?
   if (!expected_id_.empty() && expected_id_ != extension->id()) {
-    ReportFailureFromFileThread(StringPrintf(
+    ReportFailureFromFileThread(base::StringPrintf(
         "ID in new extension manifest (%s) does not match expected id (%s)",
         extension->id().c_str(),
         expected_id_.c_str()));
@@ -208,7 +209,7 @@ void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
 
     for (size_t i = 0; i < extension_->web_extent().patterns().size(); ++i) {
       if (!pattern.MatchesHost(extension_->web_extent().patterns()[i].host())) {
-        ReportFailureFromFileThread(StringPrintf(
+        ReportFailureFromFileThread(base::StringPrintf(
             "Apps must be served from the host that they affect."));
         return;
       }
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index bddce0f..3ebbeed 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/extension_apitest.h"
 
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
@@ -151,7 +152,7 @@ Extension* ExtensionApiTest::GetSingleLoadedExtension() {
       continue;
 
     if (found_extension_index != -1) {
-      message_ = StringPrintf(
+      message_ = base::StringPrintf(
           "Expected only one extension to be present.  Found %u.",
           static_cast<unsigned>(service->extensions()->size()));
       return NULL;
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc
index 01a0aef..83cefdb 100644
--- a/chrome/browser/extensions/extension_devtools_bridge.cc
+++ b/chrome/browser/extensions/extension_devtools_bridge.cc
@@ -6,6 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
@@ -81,7 +82,7 @@ void ExtensionDevToolsBridge::SendMessageToClient(const IPC::Message& msg) {
 void ExtensionDevToolsBridge::OnDispatchToAPU(const std::string& data) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
-  std::string json = StringPrintf("[%s]", data.c_str());
+  std::string json = base::StringPrintf("[%s]", data.c_str());
   profile_->GetExtensionMessageService()->DispatchEventToRenderers(
       on_page_event_name_, json, profile_, GURL());
 }
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc
index e808e0b..4afcb3c 100644
--- a/chrome/browser/extensions/extension_devtools_browsertests.cc
+++ b/chrome/browser/extensions/extension_devtools_browsertests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/ref_counted.h"
+#include "base/stringprintf.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -66,8 +67,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, FLAKY_TimelineApi) {
 
   // Test setup.
   bool result = false;
-  std::wstring register_listeners_js = StringPrintf(L"setListenersOnTab(%d)",
-                                                    tab_id);
+  std::wstring register_listeners_js = base::StringPrintf(
+      L"setListenersOnTab(%d)", tab_id);
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", register_listeners_js, &result);
   EXPECT_TRUE(result);
@@ -122,8 +123,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) {
 
   // Test setup.
   bool result = false;
-  std::wstring register_listeners_js = StringPrintf(L"setListenersOnTab(%d)",
-                                                    tab_id);
+  std::wstring register_listeners_js = base::StringPrintf(
+      L"setListenersOnTab(%d)", tab_id);
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_one->render_view_host(), L"", register_listeners_js, &result);
   EXPECT_TRUE(result);
@@ -134,7 +135,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) {
       tab_contents->render_view_host()));
 
   // Register listeners from the second extension as well.
-  std::wstring script = StringPrintf(L"registerListenersForTab(%d)", tab_id);
+  std::wstring script = base::StringPrintf(L"registerListenersForTab(%d)",
+                                           tab_id);
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_two->render_view_host(), L"", script, &result);
   EXPECT_TRUE(result);
diff --git a/chrome/browser/extensions/extension_devtools_events.cc b/chrome/browser/extensions/extension_devtools_events.cc
index 67fb031..2ccb9e5 100644
--- a/chrome/browser/extensions/extension_devtools_events.cc
+++ b/chrome/browser/extensions/extension_devtools_events.cc
@@ -8,6 +8,7 @@
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 
 // These string constants and the formats used in this file must stay
 // in sync with chrome/renderer/resources/extension_process_bindings.js
@@ -36,17 +37,17 @@ bool ExtensionDevToolsEvents::IsDevToolsEventName(
 
 // static
 std::string ExtensionDevToolsEvents::OnPageEventNameForTab(int tab_id) {
-  return StringPrintf("%s%d.%s",
-                      kDevToolsEventPrefix,
-                      tab_id,
-                      kOnPageEventName);
+  return base::StringPrintf("%s%d.%s",
+                            kDevToolsEventPrefix,
+                            tab_id,
+                            kOnPageEventName);
 }
 
 // static
 std::string ExtensionDevToolsEvents::OnTabCloseEventNameForTab(int tab_id) {
-  return StringPrintf("%s%d.%s",
-                      kDevToolsEventPrefix,
-                      tab_id,
-                      kOnTabCloseEventName);
+  return base::StringPrintf("%s%d.%s",
+                            kDevToolsEventPrefix,
+                            tab_id,
+                            kOnTabCloseEventName);
 }
 
diff --git a/chrome/browser/extensions/extension_gallery_install_apitest.cc b/chrome/browser/extensions/extension_gallery_install_apitest.cc
index 916cda8..e211756 100644
--- a/chrome/browser/extensions/extension_gallery_install_apitest.cc
+++ b/chrome/browser/extensions/extension_gallery_install_apitest.cc
@@ -29,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionGalleryInstallApiTest,
   host_resolver()->AddRule("www.example.com", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
-  std::string base_url = StringPrintf(
+  std::string base_url = base::StringPrintf(
       "http://www.example.com:%u/files/extensions/",
       test_server()->host_port_pair().port());
 
diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc
index ae84bc0..f48d9a1 100644
--- a/chrome/browser/extensions/extension_omnibox_apitest.cc
+++ b/chrome/browser/extensions/extension_omnibox_apitest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ -31,13 +32,13 @@
 namespace {
 
 std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
-  std::wstring output(StringPrintf(L"{%d} ", result.size()));
+  std::wstring output(base::StringPrintf(L"{%d} ", result.size()));
   for (size_t i = 0; i < result.size(); ++i) {
     AutocompleteMatch match = result.match_at(i);
     std::wstring provider_name(ASCIIToWide(match.provider->name()));
-    output.append(StringPrintf(L"[\"%ls\" by \"%ls\"] ",
-                               match.contents.c_str(),
-                               provider_name.c_str()));
+    output.append(base::StringPrintf(L"[\"%ls\" by \"%ls\"] ",
+                                     match.contents.c_str(),
+                                     provider_name.c_str()));
   }
   return output;
 }
diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc
index 4b3bbd9..8b12d5b 100644
--- a/chrome/browser/extensions/extension_popup_api.cc
+++ b/chrome/browser/extensions/extension_popup_api.cc
@@ -6,6 +6,7 @@
 
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ -503,7 +504,7 @@ void PopupShowFunction::Observe(NotificationType type,
 // static
 void PopupEventRouter::OnPopupClosed(Profile* profile,
                                      int routing_id) {
-  std::string full_event_name = StringPrintf(
+  std::string full_event_name = base::StringPrintf(
       extension_popup_module_events::kOnPopupClosed,
       routing_id);
 
diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc
index 5e48fc4..030b711 100644
--- a/chrome/browser/extensions/extension_proxy_api.cc
+++ b/chrome/browser/extensions/extension_proxy_api.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/extension_proxy_api.h"
 
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/common/notification_service.h"
@@ -147,7 +148,7 @@ bool UseCustomProxySettingsFunction::ApplyProxyRules(
       proxy_pref.append(proxy_server[i].host);
       if (proxy_server[i].port != ProxyServer::INVALID_PORT) {
         proxy_pref.append(":");
-        proxy_pref.append(StringPrintf("%d", proxy_server[i].port));
+        proxy_pref.append(base::StringPrintf("%d", proxy_server[i].port));
       }
     }
   }
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index b74d714..9b66cd0 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -7,6 +7,7 @@
 #include "base/base64.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ -969,7 +970,8 @@ void CaptureVisibleTabFunction::SendResultFromBitmap(
       image_data->data.size());
 
   base::Base64Encode(stream_as_string, &base64_result);
-  base64_result.insert(0, StringPrintf("data:%s;base64,", mime_type.c_str()));
+  base64_result.insert(0, base::StringPrintf("data:%s;base64,",
+                                             mime_type.c_str()));
   result_.reset(new StringValue(base64_result));
   SendResponse(true);
 }
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 214285f..3073304a 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/thread.h"
 #include "base/version.h"
 #include "chrome/browser/chrome_thread.h"
@@ -86,9 +87,9 @@ class MockService : public ExtensionUpdateService {
     for (int i = 1; i <= count; i++) {
       DictionaryValue manifest;
       manifest.SetString(extension_manifest_keys::kVersion,
-                         StringPrintf("%d.0.0.0", i));
+                         base::StringPrintf("%d.0.0.0", i));
       manifest.SetString(extension_manifest_keys::kName,
-                         StringPrintf("Extension %d", i));
+                         base::StringPrintf("Extension %d", i));
       if (update_url)
         manifest.SetString(extension_manifest_keys::kUpdateURL, *update_url);
       Extension* e = prefs_.AddExtensionWithManifest(manifest);
@@ -124,7 +125,7 @@ void CreateTestPendingExtensions(int count, const GURL& update_url,
     const bool kInstallSilently = true;
     const Extension::State kInitialState = Extension::ENABLED;
     const bool kInitialIncognitoEnabled = false;
-    std::string id = GenerateId(StringPrintf("extension%i", i));
+    std::string id = GenerateId(base::StringPrintf("extension%i", i));
     (*pending_extensions)[id] =
         PendingExtensionInfo(update_url, crx_type, kIsFromSync,
                              kInstallSilently, kInitialState,
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index f4df0e4..37685e8 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -14,6 +14,7 @@
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -1726,8 +1727,9 @@ void ExtensionsService::ReportExtensionLoadError(
 
   // TODO(port): note that this isn't guaranteed to work properly on Linux.
   std::string path_str = WideToUTF8(extension_path.ToWStringHack());
-  std::string message = StringPrintf("Could not load extension from '%s'. %s",
-                                     path_str.c_str(), error.c_str());
+  std::string message = base::StringPrintf(
+      "Could not load extension from '%s'. %s",
+      path_str.c_str(), error.c_str());
   ExtensionErrorReporter::GetInstance()->ReportError(message, be_noisy);
 }