Move the number conversions from string_util to a new file....

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2010 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/browser/extensions/extension_tabs_module.h"
 
 #include "base/base64.h"
+#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
@@ skipping 198 matching lines @@
 // Windows ---------------------------------------------------------------------
 
 bool GetWindowFunction::RunImpl() {
   int window_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
 
   Browser* browser = GetBrowserInProfileWithId(profile(), window_id,
                                                include_incognito(), &error_);
   if (!browser || !browser->window()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        keys::kWindowNotFoundError, IntToString(window_id));
+        keys::kWindowNotFoundError, base::IntToString(window_id));
     return false;
   }
 
   result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false));
   return true;
 }
 
 bool GetCurrentWindowFunction::RunImpl() {
   Browser* browser = GetCurrentBrowser();
   if (!browser || !browser->window()) {
@@ skipping 152 matching lines @@
 bool UpdateWindowFunction::RunImpl() {
   int window_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
   DictionaryValue* update_props;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
 
   Browser* browser = GetBrowserInProfileWithId(profile(), window_id,
                                                include_incognito(), &error_);
   if (!browser || !browser->window()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        keys::kWindowNotFoundError, IntToString(window_id));
+        keys::kWindowNotFoundError, base::IntToString(window_id));
     return false;
   }
 
   gfx::Rect bounds = browser->window()->GetRestoredBounds();
   // Any part of the bounds can optionally be set by the caller.
   int bounds_val;
   if (update_props->HasKey(keys::kLeftKey)) {
     EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
         keys::kLeftKey,
         &bounds_val));
@@ skipping 329 matching lines @@
       return false;
     }
 
     // If windowId is different from the current window, move between windows.
     if (ExtensionTabUtil::GetWindowId(target_browser) !=
         ExtensionTabUtil::GetWindowId(source_browser)) {
       TabStripModel* target_tab_strip = target_browser->tabstrip_model();
       contents = source_tab_strip->DetachTabContentsAt(tab_index);
       if (!contents) {
         error_ = ExtensionErrorUtils::FormatErrorMessage(
-            keys::kTabNotFoundError, IntToString(tab_id));
+            keys::kTabNotFoundError, base::IntToString(tab_id));
         return false;
       }
 
       // Clamp move location to the last position.
       // This is ">" because it can append to a new index position.
       if (new_index > target_tab_strip->count())
         new_index = target_tab_strip->count();
 
       target_tab_strip->InsertTabContentsAt(new_index, contents,
                                             TabStripModel::ADD_NONE);
@@ skipping 293 matching lines @@
   for (BrowserList::const_iterator browser = BrowserList::begin();
        browser != BrowserList::end(); ++browser) {
     if (((*browser)->profile() == profile ||
          (*browser)->profile() == incognito_profile) &&
         ExtensionTabUtil::GetWindowId(*browser) == window_id)
       return *browser;
   }
 
   if (error_message)
     *error_message = ExtensionErrorUtils::FormatErrorMessage(
-        keys::kWindowNotFoundError, IntToString(window_id));
+        keys::kWindowNotFoundError, base::IntToString(window_id));
 
   return NULL;
 }
 
 static bool GetTabById(int tab_id, Profile* profile,
                        bool include_incognito,
                        Browser** browser,
                        TabStripModel** tab_strip,
                        TabContents** contents,
                        int* tab_index,
                        std::string* error_message) {
   if (ExtensionTabUtil::GetTabById(tab_id, profile, include_incognito,
                                    browser, tab_strip, contents, tab_index))
     return true;
 
   if (error_message)
     *error_message = ExtensionErrorUtils::FormatErrorMessage(
-        keys::kTabNotFoundError, IntToString(tab_id));
+        keys::kTabNotFoundError, base::IntToString(tab_id));
 
   return false;
 }
 
 static std::string GetWindowTypeText(Browser::Type type) {
   // Note: for app popups, we report "app".
   if ((type & Browser::TYPE_APP) != 0 || type == Browser::TYPE_EXTENSION_APP)
     return keys::kWindowTypeValueApp;
   if ((type & Browser::TYPE_POPUP) != 0)
     return keys::kWindowTypeValuePopup;
 
   DCHECK(type == Browser::TYPE_NORMAL);
   return keys::kWindowTypeValueNormal;
 }
 
 static GURL ResolvePossiblyRelativeURL(std::string url_string,
                                        Extension* extension) {
   GURL url = GURL(url_string);
   if (!url.is_valid())
     url = extension->GetResourceURL(url_string);
 
   return url;
 }