summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 13:36:22 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 13:36:22 +0000
commit7594f6d81259f9a299e50c4174af080bb5e0b288 (patch)
tree8f4a3e06e80b59421f7a566effc8a5fb1f95960e /chrome
parent769c462e0ffbbbc2f210a76874d041dbcff921fc (diff)
downloadchromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.zip
chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.gz
chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.bz2
base: Move SplitStringDontTrim functions from string_util.h to string_split.h
BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3366011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/plugin/chrome_plugin_host.cc5
-rw-r--r--chrome/renderer/extensions/bindings_utils.cc5
-rw-r--r--chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc4
-rw-r--r--chrome/service/cloud_print/cloud_print_proxy_backend.cc3
4 files changed, 11 insertions, 6 deletions
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index 74fd341..a3f66d4 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/process_util.h"
+#include "base/string_split.h"
#include "chrome/common/child_process.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_plugin_lib.h"
@@ -383,7 +384,7 @@ CPError STDCALL CPB_AllowFileDrop(
static const char kDelimiter('\b');
std::vector<std::string> files;
- SplitStringDontTrim(file_drag_data, kDelimiter, &files);
+ base::SplitStringDontTrim(file_drag_data, kDelimiter, &files);
bool allowed = false;
if (!PluginThread::current()->Send(
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc
index d3fdb28..2ddbefa 100644
--- a/chrome/renderer/extensions/bindings_utils.cc
+++ b/chrome/renderer/extensions/bindings_utils.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/renderer/extensions/bindings_utils.h"
+#include "base/string_split.h"
#include "base/string_util.h"
#include "chrome/renderer/render_view.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
@@ -127,7 +128,7 @@ v8::Handle<v8::Value> CallFunctionInContext(v8::Handle<v8::Context> context,
v8::Local<v8::Value> value =
context->Global()->GetHiddenValue(v8::String::New(kChromeHidden));
std::vector<std::string> components;
- SplitStringDontTrim(function_name, '.', &components);
+ base::SplitStringDontTrim(function_name, '.', &components);
for (size_t i = 0; i < components.size(); ++i) {
if (!value.IsEmpty() && value->IsObject())
value = value->ToObject()->Get(v8::String::New(components[i].c_str()));
diff --git a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc
index 7937cea..4686a41 100644
--- a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc
+++ b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc
@@ -7,9 +7,11 @@
#include <algorithm>
#include <string>
#include <vector>
+
#include "base/histogram.h"
#include "base/logging.h"
#include "base/perftimer.h"
+#include "base/string_split.h"
#include "base/string_util.h"
#include "chrome/renderer/safe_browsing/features.h"
#include "googleurl/src/gurl.h"
@@ -54,7 +56,7 @@ bool PhishingUrlFeatureExtractor::ExtractFeatures(const GURL& url,
// Pull off the TLD and the preceeding dot.
host.erase(tld_start - 1);
std::vector<std::string> host_tokens;
- SplitStringDontTrim(host, '.', &host_tokens);
+ base::SplitStringDontTrim(host, '.', &host_tokens);
// Get rid of any empty components.
std::vector<std::string>::iterator new_end =
std::remove(host_tokens.begin(), host_tokens.end(), "");
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index 993605f..4505a7d 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -7,6 +7,7 @@
#include "base/file_util.h"
#include "base/md5.h"
#include "base/rand_util.h"
+#include "base/string_split.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
@@ -630,7 +631,7 @@ void CloudPrintProxyBackend::Core::InitJobHandlerForPrinter(
tags_list->GetString(index, &tag);
if (StartsWithASCII(tag, kTagsHashTagName, false)) {
std::vector<std::string> tag_parts;
- SplitStringDontTrim(tag, '=', &tag_parts);
+ base::SplitStringDontTrim(tag, '=', &tag_parts);
DCHECK(tag_parts.size() == 2);
if (tag_parts.size() == 2) {
printer_info_cloud.tags_hash = tag_parts[1];