diff options
| -rw-r--r-- | base/string_util.h | 9 | ||||
| -rw-r--r-- | chrome/browser/navigation_controller_unittest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/chrome_plugin/test_chrome_plugin.cc | 4 | ||||
| -rw-r--r-- | net/base/cookie_monster.cc | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/base/string_util.h b/base/string_util.h index 1c936b7..601d1d8 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -105,15 +105,6 @@ bool IsWprintfFormatPortable(const wchar_t* format); #error Define string operations appropriately for your platform #endif -// Old names for the above string functions, kept for compatibility. -// TODO(evanm): excise all references to these old names. -#define StrNCaseCmp base::strncasecmp -#define SWPrintF base::swprintf -#define VSNPrintF base::vsnprintf -#define SNPrintF base::snprintf -#define SWPrintF base::swprintf - - // Returns a reference to a globally unique empty string that functions can // return. Use this to avoid static construction of strings, not to replace // any and all uses of "std::string()" as nicer-looking sugar. 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; } diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc index 5b5f572..dbae99a 100644 --- a/net/base/cookie_monster.cc +++ b/net/base/cookie_monster.cc @@ -173,7 +173,7 @@ Time CookieMonster::ParseCookieTime(const std::string& time_string) { if (!found_month) { for (int i = 0; i < kMonthsLen; ++i) { // Match prefix, so we could match January, etc - if (StrNCaseCmp(token.c_str(), kMonths[i], 3) == 0) { + if (base::strncasecmp(token.c_str(), kMonths[i], 3) == 0) { exploded.month = i + 1; found_month = true; break; |