Convert more callers of the integer/string functions to using

string_number_conversions.h

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3013046

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

2 files changed, 15 insertions, 7 deletions

diff --git a/chrome/test/automation/dom_automation_browsertest.cc b/chrome/test/automation/dom_automation_browsertest.cc
index 7085395..dbaa1ef 100644
--- a/chrome/test/automation/dom_automation_browsertest.cc
+++ b/chrome/test/automation/dom_automation_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/ref_counted.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "chrome/test/automation/javascript_execution_controller.h"
@@ -45,8 +46,10 @@ IN_PROC_BROWSER_TEST_F(DOMAutomationTest, FindByXPath) {
   std::vector<DOMElementProxyRef> elements;
   ASSERT_TRUE(main_doc->FindElements(By::XPath("//div"), &elements));
   ASSERT_EQ(2u, elements.size());
-  for (size_t i = 0; i < elements.size(); i++)
-    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(UintToString(i)));
+  for (size_t i = 0; i < elements.size(); i++) {
+    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(
+        base::UintToString(i)));
+  }
 
   // Find 0 elements.
   ASSERT_FALSE(main_doc->FindElement(By::XPath("//nosuchtag")));
@@ -90,8 +93,10 @@ IN_PROC_BROWSER_TEST_F(DOMAutomationTest, FindBySelectors) {
   std::vector<DOMElementProxyRef> elements;
   ASSERT_TRUE(main_doc->FindElements(By::Selectors(".myclass"), &elements));
   ASSERT_EQ(2u, elements.size());
-  for (size_t i = 0; i < elements.size(); i++)
-    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(UintToString(i)));
+  for (size_t i = 0; i < elements.size(); i++) {
+    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(
+        base::UintToString(i)));
+  }
 
   // Find 0 elements.
   ASSERT_FALSE(main_doc->FindElement(By::Selectors("#nosuchid")));
@@ -131,8 +136,10 @@ IN_PROC_BROWSER_TEST_F(DOMAutomationTest, FindByText) {
   std::vector<DOMElementProxyRef> elements;
   ASSERT_TRUE(main_doc->FindElements(By::Text("div_text"), &elements));
   ASSERT_EQ(2u, elements.size());
-  for (size_t i = 0; i < elements.size(); i++)
-    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(UintToString(i)));
+  for (size_t i = 0; i < elements.size(); i++) {
+    ASSERT_NO_FATAL_FAILURE(elements[i]->EnsureNameMatches(
+        base::UintToString(i)));
+  }
 
   // Find 0 elements.
   ASSERT_FALSE(main_doc->FindElement(By::Text("nosuchtext")));
diff --git a/chrome/test/automation/extension_proxy.cc b/chrome/test/automation/extension_proxy.cc
index 66aa8e8..29fd54c 100644
--- a/chrome/test/automation/extension_proxy.cc
+++ b/chrome/test/automation/extension_proxy.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/test/automation/extension_proxy.h"
 
+#include "base/string_number_conversions.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ -94,7 +95,7 @@ bool ExtensionProxy::GetBrowserActionIndex(int* index) {
   // Do not modify |index| until we are sure we can get the value, just to be
   // nice to the caller.
   int converted_index;
-  if (!StringToInt(index_string, &converted_index)) {
+  if (!base::StringToInt(index_string, &converted_index)) {
     LOG(ERROR) << "Received index string could not be converted to int: "
                << index_string;
     return false;