diff options
Diffstat (limited to 'chrome/browser')
23 files changed, 48 insertions, 77 deletions
diff --git a/chrome/browser/banners/app_banner_data_fetcher.cc b/chrome/browser/banners/app_banner_data_fetcher.cc index c61385b..d926ed3 100644 --- a/chrome/browser/banners/app_banner_data_fetcher.cc +++ b/chrome/browser/banners/app_banner_data_fetcher.cc @@ -40,8 +40,7 @@ bool DoesManifestContainRequiredIcon(const content::Manifest& manifest) { // the src extension, and allow the icon if the extension ends with png. if (!base::EqualsASCII(icon.type.string(), "image/png") && !(icon.type.is_null() && - base::EndsWith(icon.src.ExtractFileName(), kPngExtension, - base::CompareCase::INSENSITIVE_ASCII))) + base::EndsWith(icon.src.ExtractFileName(), kPngExtension, false))) continue; for (const auto& size : icon.sizes) { diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index bc79830..d8dec49 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -919,8 +919,7 @@ void WallpaperPrivateGetOfflineWallpaperListFunction::GetList() { current = files.Next()) { std::string file_name = current.BaseName().RemoveExtension().value(); // Do not add file name of small resolution wallpaper to the list. - if (!base::EndsWith(file_name, wallpaper::kSmallWallpaperSuffix, - base::CompareCase::SENSITIVE)) + if (!base::EndsWith(file_name, wallpaper::kSmallWallpaperSuffix, true)) file_list.push_back(current.BaseName().value()); } } diff --git a/chrome/browser/chromeos/policy/device_local_account.cc b/chrome/browser/chromeos/policy/device_local_account.cc index 2657377..3e85b3c 100644 --- a/chrome/browser/chromeos/policy/device_local_account.cc +++ b/chrome/browser/chromeos/policy/device_local_account.cc @@ -68,8 +68,7 @@ bool IsDeviceLocalAccountUser(const std::string& user_id, if (user_id == chromeos::login::kGuestUserName) return false; const std::string domain = gaia::ExtractDomainName(user_id); - if (!base::EndsWith(domain, kDeviceLocalAccountDomainSuffix, - base::CompareCase::SENSITIVE)) + if (!base::EndsWith(domain, kDeviceLocalAccountDomainSuffix, true)) return false; const std::string domain_prefix = domain.substr( diff --git a/chrome/browser/component_updater/cld_component_installer_unittest.cc b/chrome/browser/component_updater/cld_component_installer_unittest.cc index aa19c25..ab40b35 100644 --- a/chrome/browser/component_updater/cld_component_installer_unittest.cc +++ b/chrome/browser/component_updater/cld_component_installer_unittest.cc @@ -102,8 +102,7 @@ TEST_F(CldComponentInstallerTest, GetInstalledPath) { const base::FilePath base_dir; const base::FilePath result = CldComponentInstallerTraits::GetInstalledPath(base_dir); - ASSERT_TRUE(base::EndsWith(result.value(), kTestCldDataFileName, - base::CompareCase::SENSITIVE)); + ASSERT_TRUE(base::EndsWith(result.value(), kTestCldDataFileName, true)); } TEST_F(CldComponentInstallerTest, GetBaseDirectory) { @@ -128,10 +127,8 @@ TEST_F(CldComponentInstallerTest, ComponentReady) { traits_.ComponentReady(version, install_dir, manifest.Pass()); base::FilePath result = CldComponentInstallerTraits::GetLatestCldDataFile(); ASSERT_TRUE(base::StartsWith(result.AsUTF16Unsafe(), - install_dir.AsUTF16Unsafe(), - base::CompareCase::SENSITIVE)); - ASSERT_TRUE(base::EndsWith(result.value(), kTestCldDataFileName, - base::CompareCase::SENSITIVE)); + install_dir.AsUTF16Unsafe(), true)); + ASSERT_TRUE(base::EndsWith(result.value(), kTestCldDataFileName, true)); } } // namespace component_updater diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 0f58e84..169f8da 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -223,8 +223,7 @@ class DelayLoadStartAndExecuteJavascript const GURL& url, ui::PageTransition transition_type) override { if (script_was_executed_ && - base::EndsWith(url.spec(), until_url_suffix_, - base::CompareCase::SENSITIVE)) { + base::EndsWith(url.spec(), until_url_suffix_, true)) { content::WebContentsObserver::Observe(NULL); test_navigation_listener_->ResumeAll(); } diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index 2cc3228..c8078e4 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -37,8 +37,7 @@ bool IsLocaleSupported() { const std::string& locale = g_browser_process->GetApplicationLocale(); static const char* const unsupported_locales[] = {"CN", "TR", "IR"}; for (size_t i = 0; i < arraysize(unsupported_locales); ++i) { - if (base::EndsWith(locale, unsupported_locales[i], - base::CompareCase::INSENSITIVE_ASCII)) { + if (base::EndsWith(locale, unsupported_locales[i], false)) { return false; } } diff --git a/chrome/browser/extensions/updater/local_extension_cache.cc b/chrome/browser/extensions/updater/local_extension_cache.cc index 14273a8..677b3e8 100644 --- a/chrome/browser/extensions/updater/local_extension_cache.cc +++ b/chrome/browser/extensions/updater/local_extension_cache.cc @@ -421,7 +421,7 @@ void LocalExtensionCache::BackendCheckCacheContentsInternal( std::string version; std::string expected_hash; if (base::EndsWith(basename, kCRXFileExtension, - base::CompareCase::INSENSITIVE_ASCII)) { + false /* case-sensitive */)) { size_t n = basename.find('-'); if (n != std::string::npos && n + 1 < basename.size() - 4) { id = basename.substr(0, n); diff --git a/chrome/browser/metrics/chromeos_metrics_provider.cc b/chrome/browser/metrics/chromeos_metrics_provider.cc index 7c65d0b..8360369 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider.cc +++ b/chrome/browser/metrics/chromeos_metrics_provider.cc @@ -115,7 +115,7 @@ EnrollmentStatus GetEnrollmentStatus() { return NON_MANAGED; std::string domain = connector->GetEnterpriseDomain(); - if (base::EndsWith(domain, kEduDomain, base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(domain, kEduDomain, false /* case insensitive */)) return MANAGED_EDU; return MANAGED_NON_EDU; diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc index 6de119ea..02469dd 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc @@ -27,8 +27,7 @@ namespace { // Determine if |proxy| is of the form "*.googlezip.net". bool IsGooglezipDataReductionProxy(const net::ProxyServer& proxy) { return proxy.is_valid() && !proxy.is_direct() && - base::EndsWith(proxy.host_port_pair().host(), ".googlezip.net", - base::CompareCase::SENSITIVE); + base::EndsWith(proxy.host_port_pair().host(), ".googlezip.net", true); } // Removes any Data Reduction Proxies like *.googlezip.net from |proxy_list|. diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc index b8471ea..cb74b99 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc @@ -45,8 +45,7 @@ bool ContainsDataReductionProxyDefaultHostSuffix( for (const net::ProxyServer& proxy : proxy_list.GetAll()) { if (proxy.is_valid() && !proxy.is_direct() && base::EndsWith(proxy.host_port_pair().host(), - kDataReductionProxyDefaultHostSuffix, - base::CompareCase::SENSITIVE)) { + kDataReductionProxyDefaultHostSuffix, true)) { return true; } } diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 5a7929e..09e4643 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -1792,8 +1792,7 @@ void SafeBrowsingDatabaseNew::RecordFileSizeHistogram( // Default to logging DB sizes unless |file_path| points at PrefixSet storage. std::string histogram_name("SB2.DatabaseSizeKilobytes"); - if (base::EndsWith(filename, kPrefixSetFileSuffix, - base::CompareCase::SENSITIVE)) { + if (base::EndsWith(filename, kPrefixSetFileSuffix, true)) { histogram_name = "SB2.PrefixSetSizeKilobytes"; // Clear the PrefixSet suffix to have the histogram suffix selector below // work the same for PrefixSet-based storage as it does for simple safe @@ -1806,28 +1805,21 @@ void SafeBrowsingDatabaseNew::RecordFileSizeHistogram( // Changes to histogram suffixes below need to be mirrored in the // SafeBrowsingLists suffix enum in histograms.xml. - if (base::EndsWith(filename, kBrowseDBFile, base::CompareCase::SENSITIVE)) + if (base::EndsWith(filename, kBrowseDBFile, true)) histogram_name.append(".Browse"); - else if (base::EndsWith(filename, kDownloadDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kDownloadDBFile, true)) histogram_name.append(".Download"); - else if (base::EndsWith(filename, kCsdWhitelistDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kCsdWhitelistDBFile, true)) histogram_name.append(".CsdWhitelist"); - else if (base::EndsWith(filename, kDownloadWhitelistDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kDownloadWhitelistDBFile, true)) histogram_name.append(".DownloadWhitelist"); - else if (base::EndsWith(filename, kInclusionWhitelistDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kInclusionWhitelistDBFile, true)) histogram_name.append(".InclusionWhitelist"); - else if (base::EndsWith(filename, kExtensionBlacklistDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kExtensionBlacklistDBFile, true)) histogram_name.append(".ExtensionBlacklist"); - else if (base::EndsWith(filename, kIPBlacklistDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kIPBlacklistDBFile, true)) histogram_name.append(".IPBlacklist"); - else if (base::EndsWith(filename, kUnwantedSoftwareDBFile, - base::CompareCase::SENSITIVE)) + else if (base::EndsWith(filename, kUnwantedSoftwareDBFile, true)) histogram_name.append(".UnwantedSoftware"); else NOTREACHED(); // Add support for new lists above. diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc index 55282b8..c611501 100644 --- a/chrome/browser/search/iframe_source.cc +++ b/chrome/browser/search/iframe_source.cc @@ -25,13 +25,13 @@ IframeSource::~IframeSource() { std::string IframeSource::GetMimeType( const std::string& path_and_query) const { std::string path(GURL("chrome-search://host/" + path_and_query).path()); - if (base::EndsWith(path, ".js", base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(path, ".js", false)) return "application/javascript"; - if (base::EndsWith(path, ".png", base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(path, ".png", false)) return "image/png"; - if (base::EndsWith(path, ".css", base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(path, ".css", false)) return "text/css"; - if (base::EndsWith(path, ".html", base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(path, ".html", false)) return "text/html"; return std::string(); } diff --git a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc index 59e4ac8..2e60864 100644 --- a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc +++ b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc @@ -54,7 +54,7 @@ GURL GetNormalizedURL(const GURL& url) { replacements.SetHostStr(base::StringPiece(host).substr(www.size())); // Strip trailing slash (if any). const std::string path(url.path()); - if (base::EndsWith(path, "/", base::CompareCase::SENSITIVE)) + if (base::EndsWith(path, "/", true)) replacements.SetPathStr(base::StringPiece(path).substr(0, path.size() - 1)); return url.ReplaceComponents(replacements); } diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc index 667fc25..b1dad56 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc @@ -239,7 +239,7 @@ bool SupervisedUserURLFilter::HostMatchesPattern(const std::string& host, const std::string& pattern) { std::string trimmed_pattern = pattern; std::string trimmed_host = host; - if (base::EndsWith(pattern, ".*", base::CompareCase::SENSITIVE)) { + if (base::EndsWith(pattern, ".*", true)) { size_t registry_length = GetRegistryLength( trimmed_host, EXCLUDE_UNKNOWN_REGISTRIES, EXCLUDE_PRIVATE_REGISTRIES); // A host without a known registry part does not match. @@ -258,8 +258,7 @@ bool SupervisedUserURLFilter::HostMatchesPattern(const std::string& host, // pattern. if (trimmed_pattern.empty() || trimmed_pattern.find('*') != std::string::npos || - !base::EndsWith(trimmed_host, trimmed_pattern, - base::CompareCase::SENSITIVE)) { + !base::EndsWith(trimmed_host, trimmed_pattern, true)) { return false; } diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index 08a863e..ebae3b2 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -964,8 +964,7 @@ gfx::Image CreateFavicon(SkColor color) { gfx::Image Create1xFaviconFromPNGFile(const std::string& path) { const char* kPNGExtension = ".png"; - if (!base::EndsWith(path, kPNGExtension, - base::CompareCase::INSENSITIVE_ASCII)) + if (!base::EndsWith(path, kPNGExtension, false)) return gfx::Image(); base::FilePath full_path; diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc index e087266..7bd7b96 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc @@ -1400,16 +1400,16 @@ TEST_F(AutofillDialogControllerTest, BillingVsShippingStreetAddress) { // separated by commas. EXPECT_TRUE(base::StartsWith(form_structure()->field(0)->value, shipping_profile.GetRawInfo(ADDRESS_HOME_LINE1), - base::CompareCase::SENSITIVE)); + true)); EXPECT_TRUE(base::EndsWith(form_structure()->field(0)->value, shipping_profile.GetRawInfo(ADDRESS_HOME_LINE2), - base::CompareCase::SENSITIVE)); + true)); EXPECT_TRUE(base::StartsWith(form_structure()->field(1)->value, billing_profile.GetRawInfo(ADDRESS_HOME_LINE1), - base::CompareCase::SENSITIVE)); + true)); EXPECT_TRUE(base::EndsWith(form_structure()->field(1)->value, billing_profile.GetRawInfo(ADDRESS_HOME_LINE2), - base::CompareCase::SENSITIVE)); + true)); // The textareas should be an exact match. EXPECT_EQ(shipping_profile.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS), form_structure()->field(2)->value); diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm index 0fa91ec..840de46 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm @@ -563,10 +563,8 @@ NSAttributedString* CreateClassifiedAttributedString( match.GetAdditionalInfo(kACMatchPropertyContentsStartIndex), &contentsStartIndex); // Ignore invalid state. - if (!base::StartsWith(match.fill_into_edit, inputText, - base::CompareCase::SENSITIVE) || - !base::EndsWith(match.fill_into_edit, match.contents, - base::CompareCase::SENSITIVE) || + if (!base::StartsWith(match.fill_into_edit, inputText, true) || + !base::EndsWith(match.fill_into_edit, match.contents, true) || ((size_t)contentsStartIndex >= inputText.length())) { return 0; } diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc index 0797df7..cfd6955 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc @@ -34,8 +34,7 @@ namespace { // Makes sure that .jpg also shows .JPG. gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info, std::string* file_extension) { - return base::EndsWith(file_info->filename, *file_extension, - base::CompareCase::INSENSITIVE_ASCII); + return base::EndsWith(file_info->filename, *file_extension, false); } // Deletes |data| when gtk_file_filter_add_custom() is done with it. diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc index c02b0ae..4ea7fe5 100644 --- a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc +++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc @@ -67,7 +67,7 @@ TEST(ManagePasswordsViewUtilTest, GetSavePasswordDialogTitleTextAndLinkRange) { // Verify against expectations. EXPECT_TRUE(base::EndsWith( title, base::ASCIIToUTF16(test_cases[i].expected_title_text_ends_with), - base::CompareCase::INSENSITIVE_ASCII)); + false)); EXPECT_EQ(test_cases[i].expected_link_range_start, title_link_range.start()); EXPECT_EQ(test_cases[i].expected_link_range_end, title_link_range.end()); diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index 68ccc01..7960c0f 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -49,25 +49,19 @@ const char kFallbackFrontendURL[] = std::string GetMimeTypeForPath(const std::string& path) { std::string filename = PathWithoutParams(path); - if (base::EndsWith(filename, ".html", base::CompareCase::INSENSITIVE_ASCII)) { + if (base::EndsWith(filename, ".html", false)) { return "text/html"; - } else if (base::EndsWith(filename, ".css", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".css", false)) { return "text/css"; - } else if (base::EndsWith(filename, ".js", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".js", false)) { return "application/javascript"; - } else if (base::EndsWith(filename, ".png", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".png", false)) { return "image/png"; - } else if (base::EndsWith(filename, ".gif", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".gif", false)) { return "image/gif"; - } else if (base::EndsWith(filename, ".svg", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".svg", false)) { return "image/svg+xml"; - } else if (base::EndsWith(filename, ".manifest", - base::CompareCase::INSENSITIVE_ASCII)) { + } else if (base::EndsWith(filename, ".manifest", false)) { return "text/cache-manifest"; } return "text/html"; diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index 6cd974b..352eba5 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -124,7 +124,7 @@ bool HandleRequestCallback( const content::WebUIDataSource::GotDataCallback& callback) { // ChromeWebUIDataSource handles most requests except for the print preview // data. - if (!base::EndsWith(path, "/print.pdf", base::CompareCase::SENSITIVE)) + if (!base::EndsWith(path, "/print.pdf", true)) return false; // Print Preview data. diff --git a/chrome/browser/ui/webui/profiler_ui.cc b/chrome/browser/ui/webui/profiler_ui.cc index 97629121..fda2c09 100644 --- a/chrome/browser/ui/webui/profiler_ui.cc +++ b/chrome/browser/ui/webui/profiler_ui.cc @@ -58,7 +58,7 @@ class ProfilerWebUIDataSource : public content::URLDataSource { } std::string GetMimeType(const std::string& path) const override { - if (base::EndsWith(path, ".js", base::CompareCase::INSENSITIVE_ASCII)) + if (base::EndsWith(path, ".js", false)) return "application/javascript"; return "text/html"; } diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 68b5929..89cad0e 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -184,8 +184,8 @@ bool HasExistingExtensionShim(const base::FilePath& destination_directory, !shim_path.empty(); shim_path = enumerator.Next()) { if (shim_path.BaseName() != own_basename && base::EndsWith(shim_path.RemoveExtension().value(), - extension_id, - base::CompareCase::SENSITIVE)) { + extension_id, + true /* case_sensitive */)) { return true; } } |