base: Get rid of 'using' declaration of StringAppendF.

Update the callers to append base:: in the calls to StringAppendF. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/4974001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66116 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 15, 2010 · a77fa2d · a77fa2d
1 parent 055d7f2
commit a77fa2d
Show file tree

Hide file tree

Showing 32 changed files with 139 additions and 123 deletions.
diff --git a/base/stringprintf.h b/base/stringprintf.h
@@ -50,7 +50,5 @@ void StringAppendV(std::wstring* dst, const wchar_t* format, va_list ap)
 // TODO(brettw) remove these when calling code is converted.
 using base::StringPrintf;
 using base::StringAppendV;
-using base::StringAppendF;
-using base::StringAppendV;
 
 #endif  // BASE_STRINGPRINTF_H_
diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc
@@ -256,8 +256,8 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) {
     // /proc/[pid]/syscall is formatted as follows:
     // syscall_number arg1 ... arg6 sp pc
     // but we just check syscall_number through arg3.
-    StringAppendF(&expected_syscall_data, "%d 0x%x %p 0x1 ",
-                  SYS_read, tid_fd, tid_buf_addr);
+    base::StringAppendF(&expected_syscall_data, "%d 0x%x %p 0x1 ",
+                        SYS_read, tid_fd, tid_buf_addr);
     pid_t crashing_tid =
         base::FindThreadIDWithSyscall(crashing_pid, expected_syscall_data);
     if (crashing_tid == -1) {

diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc
@@ -88,8 +88,8 @@ FilePath TextDatabase::IDToFileName(DBIdent id) {
   // scheme: the caller should assign IDs as it feels fit with the knowledge
   // that they will apppear on disk in this form.
   FilePath::StringType filename(file_base());
-  StringAppendF(&filename, FILE_PATH_LITERAL("%d-%02d"),
-                id / 100, id % 100);
+  base::StringAppendF(&filename, FILE_PATH_LITERAL("%d-%02d"),
+                      id / 100, id % 100);
   return FilePath(filename);
 }
 

diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -213,8 +213,8 @@ TEST(MetricsLogTest, CreateHash) {
     // the metrics server uses.
     std::string hash_hex = "0x";
     for (size_t j = 0; j < 8; j++) {
-      StringAppendF(&hash_hex, "%02x",
-                    static_cast<uint8>(hash_string.data()[j]));
+      base::StringAppendF(&hash_hex, "%02x",
+                          static_cast<uint8>(hash_string.data()[j]));
     }
     EXPECT_EQ(cases[i].output, hash_hex);
   }

diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
@@ -361,14 +361,16 @@ void Predictor::GetHtmlReferrerLists(std::string* output) {
     for (Referrer::iterator future_url = referrer->begin();
          future_url != referrer->end(); ++future_url) {
       output->append("<tr align=right>");
-      if (first_set_of_futures)
-        StringAppendF(output, "<td rowspan=%d>%s</td><td rowspan=%d>%d</td>",
-                      static_cast<int>(referrer->size()),
-                      it->spec().c_str(),
-                      static_cast<int>(referrer->size()),
-                      static_cast<int>(referrer->use_count()));
+      if (first_set_of_futures) {
+        base::StringAppendF(output,
+                            "<td rowspan=%d>%s</td><td rowspan=%d>%d</td>",
+                            static_cast<int>(referrer->size()),
+                            it->spec().c_str(),
+                            static_cast<int>(referrer->size()),
+                            static_cast<int>(referrer->use_count()));
+      }
       first_set_of_futures = false;
-      StringAppendF(output,
+      base::StringAppendF(output,
           "<td>%d</td><td>%d</td><td>%d</td><td>%2.3f</td><td>%s</td></tr>",
           static_cast<int>(future_url->second.navigation_count()),
           static_cast<int>(future_url->second.preconnection_count()),

diff --git a/chrome/browser/net/url_info.cc b/chrome/browser/net/url_info.cc
@@ -251,10 +251,10 @@ static std::string HoursMinutesSeconds(int seconds) {
   int print_minutes = minutes % 60;
   int print_hours = minutes/60;
   if (print_hours)
-    StringAppendF(&result, "%.2d:",  print_hours);
+    base::StringAppendF(&result, "%.2d:",  print_hours);
   if (print_hours || print_minutes)
-    StringAppendF(&result, "%2.2d:",  print_minutes);
-  StringAppendF(&result, "%2.2d",  print_seconds);
+    base::StringAppendF(&result, "%2.2d:",  print_minutes);
+  base::StringAppendF(&result, "%2.2d",  print_seconds);
   return result;
 }
 
@@ -266,8 +266,8 @@ void UrlInfo::GetHtmlTable(const UrlInfoTable host_infos,
   if (0 == host_infos.size())
     return;
   output->append(description);
-  StringAppendF(output, "%" PRIuS " %s", host_infos.size(),
-                (1 == host_infos.size()) ? "hostname" : "hostnames");
+  base::StringAppendF(output, "%" PRIuS " %s", host_infos.size(),
+                      (1 == host_infos.size()) ? "hostname" : "hostnames");
 
   if (brief) {
     output->append("<br><br>");
@@ -291,18 +291,21 @@ void UrlInfo::GetHtmlTable(const UrlInfoTable host_infos,
   for (UrlInfoTable::const_iterator it(host_infos.begin());
        it != host_infos.end(); it++) {
     queue.sample((it->queue_duration_.InMilliseconds()));
-    StringAppendF(output, row_format,
-                  RemoveJs(it->url_.spec()).c_str(),
-                  HoursMinutesSeconds(when.sample(
-                      (current_time - it->time_).InSeconds())).c_str(),
-                  it->GetAsciiMotivation().c_str());
+    base::StringAppendF(
+        output,
+        row_format,
+        RemoveJs(it->url_.spec()).c_str(),
+                 HoursMinutesSeconds(when.sample(
+                     (current_time - it->time_).InSeconds())).c_str(),
+        it->GetAsciiMotivation().c_str());
   }
   output->append("</table>");
 
 #ifndef NDEBUG
-  StringAppendF(output,
-                "Prefetch Queue Durations: min=%d, avg=%d, max=%d<br><br>",
-                queue.minimum(), queue.average(), queue.maximum());
+  base::StringAppendF(
+      output,
+      "Prefetch Queue Durations: min=%d, avg=%d, max=%d<br><br>",
+      queue.minimum(), queue.average(), queue.maximum());
 #endif
 
   output->append("<br>");

diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc
@@ -401,12 +401,13 @@ std::string SelectFileDialogImpl::FileBrowseDelegate::GetDialogArgs() const {
     for (size_t j = 0; j < file_types_.extensions[i].size(); ++j) {
       if (!exts.empty())
         exts.append(",");
-      StringAppendF(&exts, "\"%s\"", file_types_.extensions[i][j].c_str());
+      base::StringAppendF(&exts, "\"%s\"",
+                          file_types_.extensions[i][j].c_str());
     }
 
     if (!exts_list.empty())
       exts_list.append(",");
-    StringAppendF(&exts_list, "[%s]", exts.c_str());
+    base::StringAppendF(&exts_list, "[%s]", exts.c_str());
 
     std::string desc;
     if (i < file_types_.extension_description_overrides.size()) {
@@ -423,7 +424,7 @@ std::string SelectFileDialogImpl::FileBrowseDelegate::GetDialogArgs() const {
 
     if (!desc_list.empty())
       desc_list.append(",");
-    StringAppendF(&desc_list, "\"%s\"", desc.c_str());
+    base::StringAppendF(&desc_list, "\"%s\"", desc.c_str());
   }
 
   std::string filename = default_path_.BaseName().value();

diff --git a/chrome/common/sandbox_mac.mm b/chrome/common/sandbox_mac.mm
@@ -94,7 +94,7 @@ bool EscapeSingleChar(char c, std::string* dst) {
     if (c < 32 || c > 126) {
       // Any characters that aren't printable ASCII get the \u treatment.
       unsigned int as_uint = static_cast<unsigned int>(c);
-      StringAppendF(dst, "\\u%04X", as_uint);
+      base::StringAppendF(dst, "\\u%04X", as_uint);
       continue;
     }
 

diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc
@@ -148,7 +148,7 @@ URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() {
       new ServiceURLRequestContextGetter();
   // Now set up the user agent for cloudprint.
   std::string user_agent = getter->user_agent();
-  StringAppendF(&user_agent, " %s", kCloudPrintUserAgent);
+  base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent);
   getter->set_user_agent(user_agent);
   return getter;
 }

diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
@@ -55,7 +55,7 @@ std::string BuildOSCpuInfo() {
   }
 #endif
 
-  StringAppendF(
+  base::StringAppendF(
       &os_cpu,
 #if defined(OS_WIN)
       "Windows NT %d.%d",
@@ -91,12 +91,12 @@ std::string MakeUserAgentForServiceProcess() {
   std::string extra_version_info;
   if (!version_info.IsOfficialBuild())
     extra_version_info = "-devel";
-  StringAppendF(&user_agent,
-                "Chrome Service %s(%s)%s %s ",
-                version_info.Version().c_str(),
-                version_info.LastChange().c_str(),
-                extra_version_info.c_str(),
-                BuildOSCpuInfo().c_str());
+  base::StringAppendF(&user_agent,
+                      "Chrome Service %s(%s)%s %s ",
+                      version_info.Version().c_str(),
+                      version_info.LastChange().c_str(),
+                      extra_version_info.c_str(),
+                      BuildOSCpuInfo().c_str());
   return user_agent;
 }
 

diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
@@ -576,8 +576,9 @@ class AutomationProxyTest3 : public UITest {
 
 std::wstring CreateJSStringForDOMQuery(const std::wstring& id) {
   std::wstring jscript(L"window.domAutomationController");
-  StringAppendF(&jscript, L".send(document.getElementById('%ls').nodeName);",
-                id.c_str());
+  base::StringAppendF(&jscript,
+                      L".send(document.getElementById('%ls').nodeName);",
+                      id.c_str());
   return jscript;
 }
 

diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
@@ -35,7 +35,7 @@ class NewTabUIStartupTest : public UIPerfTest {
                     bool important) {
     std::string times;
     for (int i = 0; i < kNumCycles; ++i)
-      StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
+      base::StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
     PrintResultList("new_tab", "", label, times, "ms", important);
   }
 

diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc
@@ -107,7 +107,7 @@ class ShutdownTest : public UIPerfTest {
 
     std::string times;
     for (int i = 0; i < numCycles; ++i)
-      StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
+      base::StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
     PrintResultList(graph, "", trace, times, "ms", important);
   }
 };

diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
@@ -202,8 +202,11 @@ class StartupTest : public UIPerfTest {
     }
 
     std::string times;
-    for (int i = 0; i < numCycles; ++i)
-      StringAppendF(&times, "%.2f,", timings[i].end_to_end.InMillisecondsF());
+    for (int i = 0; i < numCycles; ++i) {
+      base::StringAppendF(&times,
+                          "%.2f,",
+                          timings[i].end_to_end.InMillisecondsF());
+    }
     PrintResultList(graph, "", trace, times, "ms", important);
 
     if (num_tabs > 0) {
@@ -213,21 +216,21 @@ class StartupTest : public UIPerfTest {
       times.clear();
       name = name_base + "-start";
       for (int i = 0; i < numCycles; ++i)
-        StringAppendF(&times, "%.2f,", timings[i].first_start_ms);
+        base::StringAppendF(&times, "%.2f,", timings[i].first_start_ms);
       PrintResultList(graph, "", name.c_str(), times, "ms", important);
 
       times.clear();
       name = name_base + "-first";
       for (int i = 0; i < numCycles; ++i)
-        StringAppendF(&times, "%.2f,", timings[i].first_stop_ms);
+        base::StringAppendF(&times, "%.2f,", timings[i].first_stop_ms);
       PrintResultList(graph, "", name.c_str(), times, "ms", important);
 
       if (nth_timed_tab > 0) {
         // Display only the time necessary to load the first n tabs.
         times.clear();
         name = name_base + "-" + base::IntToString(nth_timed_tab);
         for (int i = 0; i < numCycles; ++i)
-          StringAppendF(&times, "%.2f,", timings[i].nth_tab_stop_ms);
+          base::StringAppendF(&times, "%.2f,", timings[i].nth_tab_stop_ms);
         PrintResultList(graph, "", name.c_str(), times, "ms", important);
       }
 
@@ -236,7 +239,7 @@ class StartupTest : public UIPerfTest {
         times.clear();
         name = name_base + "-all";
         for (int i = 0; i < numCycles; ++i)
-          StringAppendF(&times, "%.2f,", timings[i].last_stop_ms);
+          base::StringAppendF(&times, "%.2f,", timings[i].last_stop_ms);
         PrintResultList(graph, "", name.c_str(), times, "ms", important);
       }
     }

diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
@@ -66,7 +66,7 @@ class TabSwitchingUITest : public UIPerfTest {
     bool important) {
       std::string times;
       for (int i = 0; i < kNumCycles; ++i)
-        StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
+        base::StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
       PrintResultList("times", "", label, times, "ms", important);
   }
 

diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -348,7 +348,7 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
 
     std::string times;
     for (int i = 0; i < kNumCycles; ++i)
-      StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
+      base::StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
 
     PrintResultList(graph, "", trace, times, "ms", important);
   }
@@ -1382,8 +1382,9 @@ void PrintPerfTestResults(const Monitor* monitor,
 
   for (int i = 0; i < num_cycles; ++i) {
     ASSERT_TRUE(monitor[i].is_valid());
-    StringAppendF(&times, "%.2f,",
-                  monitor[i].duration().InMillisecondsF());
+    base::StringAppendF(&times,
+                        "%.2f,",
+                        monitor[i].duration().InMillisecondsF());
   }
 
   PrintResultList(result_name, "", "t", times, "ms", false);

diff --git a/courgette/adjustment_method.cc b/courgette/adjustment_method.cc
@@ -81,11 +81,11 @@ struct OrderLabelInfoByAddressAscending {
 
 static std::string ToString(LabelInfo* info) {
   std::string s;
-  StringAppendF(&s, "%c%d", "pm"[info->is_model_], info->debug_index_);
+  base::StringAppendF(&s, "%c%d", "pm"[info->is_model_], info->debug_index_);
   if (info->label_->index_ != Label::kNoIndex)
-    StringAppendF(&s, " (%d)", info->label_->index_);
+    base::StringAppendF(&s, " (%d)", info->label_->index_);
 
-  StringAppendF(&s, " #%u", info->refs_);
+  base::StringAppendF(&s, " #%u", info->refs_);
   return s;
 }