summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/url_pattern.cc2
-rw-r--r--chrome/common/pepper_plugin_registry.cc6
-rw-r--r--chrome/common/zip.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/extensions/url_pattern.cc b/chrome/common/extensions/url_pattern.cc
index 62459a3..aa7e252 100644
--- a/chrome/common/extensions/url_pattern.cc
+++ b/chrome/common/extensions/url_pattern.cc
@@ -112,7 +112,7 @@ bool URLPattern::Parse(const std::string& pattern) {
// The first component can optionally be '*' to match all subdomains.
std::vector<std::string> host_components;
- SplitString(host_, '.', &host_components);
+ base::SplitString(host_, '.', &host_components);
if (host_components[0] == "*") {
match_subdomains_ = true;
host_components.erase(host_components.begin(),
diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc
index 7243665..87a2bd3 100644
--- a/chrome/common/pepper_plugin_registry.cc
+++ b/chrome/common/pepper_plugin_registry.cc
@@ -75,17 +75,17 @@ void PepperPluginRegistry::GetPluginInfoFromSwitch(
// *1( LWS + ";" + LWS + <mime-type> )
std::vector<std::string> modules;
- SplitString(value, ',', &modules);
+ base::SplitString(value, ',', &modules);
for (size_t i = 0; i < modules.size(); ++i) {
std::vector<std::string> parts;
- SplitString(modules[i], ';', &parts);
+ base::SplitString(modules[i], ';', &parts);
if (parts.size() < 2) {
DLOG(ERROR) << "Required mime-type not found";
continue;
}
std::vector<std::string> name_parts;
- SplitString(parts[0], '#', &name_parts);
+ base::SplitString(parts[0], '#', &name_parts);
PepperPluginInfo plugin;
#if defined(OS_WIN)
diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc
index 01de36f..3e24b53 100644
--- a/chrome/common/zip.cc
+++ b/chrome/common/zip.cc
@@ -49,7 +49,7 @@ static bool ExtractCurrentFile(unzFile zip_file,
if (filename.find(FILE_PATH_LITERAL("..")) != FilePath::StringType::npos)
return false;
- SplitString(filename, '/', &filename_parts);
+ base::SplitString(filename, '/', &filename_parts);
FilePath dest_file(dest_dir);
std::vector<FilePath::StringType>::iterator iter;