summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_devtools_events.cc3
-rw-r--r--chrome/browser/extensions/extension_updater.cc2
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc8
3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_devtools_events.cc b/chrome/browser/extensions/extension_devtools_events.cc
index f29d459..07b691e 100644
--- a/chrome/browser/extensions/extension_devtools_events.cc
+++ b/chrome/browser/extensions/extension_devtools_events.cc
@@ -28,7 +28,8 @@ bool ExtensionDevToolsEvents::IsDevToolsEventName(
true /* case_sensitive */)) {
// At this point we want something like "4.onPageEvent"
std::vector<std::string> parts;
- SplitString(event_name.substr(strlen(kDevToolsEventPrefix)), '.', &parts);
+ base::SplitString(
+ event_name.substr(strlen(kDevToolsEventPrefix)), '.', &parts);
if (parts.size() == 2 && base::StringToInt(parts[0], tab_id)) {
return true;
}
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 42ccfba..da669c6 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -575,7 +575,7 @@ void ExtensionUpdater::ProcessBlacklist(const std::string& data) {
return;
}
std::vector<std::string> blacklist;
- SplitString(data, '\n', &blacklist);
+ base::SplitString(data, '\n', &blacklist);
// Tell ExtensionService to update prefs.
service_->UpdateExtensionBlacklist(blacklist);
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index bb07c28..25d40c4 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -247,10 +247,10 @@ static const int kUpdateFrequencySecs = 15;
static void ExtractParameters(const std::string& params,
std::map<std::string, std::string>* result) {
std::vector<std::string> pairs;
- SplitString(params, '&', &pairs);
+ base::SplitString(params, '&', &pairs);
for (size_t i = 0; i < pairs.size(); i++) {
std::vector<std::string> key_val;
- SplitString(pairs[i], '=', &key_val);
+ base::SplitString(pairs[i], '=', &key_val);
if (key_val.size() > 0) {
std::string key = key_val[0];
EXPECT_TRUE(result->find(key) == result->end());
@@ -326,7 +326,7 @@ class ExtensionUpdaterTest : public testing::Test {
// look something like "?x=id%3D<id>%26v%3D<version>%26uc".
EXPECT_TRUE(url.has_query());
std::vector<std::string> parts;
- SplitString(url.query(), '=', &parts);
+ base::SplitString(url.query(), '=', &parts);
EXPECT_EQ(2u, parts.size());
EXPECT_EQ("x", parts[0]);
std::string decoded = UnescapeURLComponent(parts[1],
@@ -388,7 +388,7 @@ class ExtensionUpdaterTest : public testing::Test {
// look something like "?x=id%3D<id>%26v%3D<version>%26uc".
EXPECT_TRUE(url.has_query());
std::vector<std::string> parts;
- SplitString(url.query(), '=', &parts);
+ base::SplitString(url.query(), '=', &parts);
EXPECT_EQ(2u, parts.size());
EXPECT_EQ("x", parts[0]);
std::string decoded = UnescapeURLComponent(parts[1],