Remove compatibility #defines in string_util.h

Review URL: http://codereview.chromium.org/17014

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

2 files changed, 8 insertions, 5 deletions

diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc
index b2e21cf..8ffd331 100644
--- a/chrome/browser/navigation_controller_unittest.cc
+++ b/chrome/browser/navigation_controller_unittest.cc
@@ -1168,7 +1168,8 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
   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);
@@ -1180,7 +1181,8 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
   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);
@@ -1198,7 +1200,8 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
 
   // 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);
diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.cc b/chrome/test/chrome_plugin/test_chrome_plugin.cc
index 7343205..9e6d0e0 100644
--- a/chrome/test/chrome_plugin/test_chrome_plugin.cc
+++ b/chrome/test/chrome_plugin/test_chrome_plugin.cc
@@ -169,8 +169,8 @@ CPError STDCALL CPP_Shutdown() {
 }
 
 CPBool STDCALL CPP_ShouldInterceptRequest(CPRequest* request) {
-  DCHECK(StrNCaseCmp(request->url, kChromeTestPluginProtocol,
-                     arraysize(kChromeTestPluginProtocol) - 1) == 0);
+  DCHECK(base::strncasecmp(request->url, kChromeTestPluginProtocol,
+                           arraysize(kChromeTestPluginProtocol) - 1) == 0);
   return FindPayload(request->url) != NULL;
 }