Remove compatibility #defines in string_util.h

chrome/browser/navigation_controller_unittest.cc

 // Copyright (c) 2006-2008 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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile_manager.h"
@@ skipping 1150 matching lines @@
 TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
   size_t original_count = NavigationController::max_entry_count();
   const size_t kMaxEntryCount = 5;
 
   NavigationController::set_max_entry_count(kMaxEntryCount);
 
   int url_index;
   char buffer[128];
   // Load up to the max count, all entries should be there.
   for (url_index = 0; url_index < kMaxEntryCount; url_index++) {
-    SNPrintF(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(), url_index);
+    base::snprintf(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(),
+                   url_index);
     GURL url(buffer);
     contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
     contents->CompleteNavigationAsRenderer(url_index, url);
   }
 
   EXPECT_EQ(contents->controller()->GetEntryCount(), kMaxEntryCount);
 
   // Created a PrunedListener to observe prune notifications.
   PrunedListener listener(contents->controller());
 
   // Navigate some more.
-  SNPrintF(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(), url_index);
+  base::snprintf(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(),
+                 url_index);
   GURL url(buffer);
   contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
   contents->CompleteNavigationAsRenderer(url_index, url);
   url_index++;
 
   // We should have got a pruned navigation.
   EXPECT_EQ(1, listener.notification_count_);
   EXPECT_TRUE(listener.details_.from_front);
   EXPECT_EQ(1, listener.details_.count);
 
   // We expect http://www.a.com/0 to be gone.
   EXPECT_EQ(contents->controller()->GetEntryCount(), kMaxEntryCount);
   EXPECT_EQ(contents->controller()->GetEntryAtIndex(0)->url(),
             GURL(scheme1() + "://www.a.com/1"));
 
   // More navigations.
   for (int i = 0; i < 3; i++) {
-    SNPrintF(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(), url_index);
+    base::snprintf(buffer, 128, (scheme1() + "://www.a.com/%d").c_str(),
+                   url_index);
     url = GURL(buffer);
     contents->controller()->LoadURL(url, GURL(), PageTransition::TYPED);
       contents->CompleteNavigationAsRenderer(url_index, url);
     url_index++;
   }
   EXPECT_EQ(contents->controller()->GetEntryCount(), kMaxEntryCount);
   EXPECT_EQ(contents->controller()->GetEntryAtIndex(0)->url(),
             GURL(scheme1() + "://www.a.com/4"));
 
   NavigationController::set_max_entry_count(original_count);
@@ skipping 366 matching lines @@
 
   helper_.AssertSingleWindowWithSingleTab(windows_, 2);
   helper_.AssertTabEquals(0, 1, 2, *(windows_[0]->tabs[0]));
 
   TabNavigation nav(0, url0, GURL(), std::wstring(), std::string(),
                     PageTransition::LINK);
   helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[1]);
 }