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

chrome/browser/views/bookmark_bar_view_test.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 "base/keyboard_codes.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
@@ skipping 197 matching lines @@
   void AddTestData(bool big_menu) {
     std::string test_base = "file:///c:/tmp/";
 
     const BookmarkNode* f1 = model_->AddGroup(
         model_->GetBookmarkBarNode(), 0, L"F1");
     model_->AddURL(f1, 0, L"f1a", GURL(test_base + "f1a"));
     const BookmarkNode* f11 = model_->AddGroup(f1, 1, L"F11");
     model_->AddURL(f11, 0, L"f11a", GURL(test_base + "f11a"));
     if (big_menu) {
       for (int i = 1; i <= 100; ++i) {
-        model_->AddURL(f1, i + 1, L"f" + IntToWString(i),
-                       GURL(test_base + "f" + IntToString(i)));
+        model_->AddURL(f1, i + 1, L"f" + UTF8ToWide(base::IntToString(i)),
+                       GURL(test_base + "f" + base::IntToString(i)));
       }
     }
     model_->AddURL(model_->GetBookmarkBarNode(), 1, L"a",
                    GURL(test_base + "a"));
     model_->AddURL(model_->GetBookmarkBarNode(), 2, L"b",
                    GURL(test_base + "b"));
     model_->AddURL(model_->GetBookmarkBarNode(), 3, L"c",
                    GURL(test_base + "c"));
     model_->AddURL(model_->GetBookmarkBarNode(), 4, L"d",
                    GURL(test_base + "d"));
@@ skipping 1102 matching lines @@
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
     ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);
 
     // Close the window.
     window_->Close();
     window_ = NULL;
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu)