base: Move SplitString functions into the base namespace and update the callers.

chrome/browser/importer/toolbar_importer.cc

 // 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/browser/importer/toolbar_importer.h"
 
 #include <limits>
 
 #include "base/rand_util.h"
 #include "base/string_split.h"
@@ skipping 25 matching lines @@
 static const char* kGoogleDomainSecureCookieId = "SID=";
 
 bool toolbar_importer_utils::IsGoogleGAIACookieInstalled() {
   net::CookieStore* store =
       Profile::GetDefaultRequestContext()->GetCookieStore();
   GURL url(kGoogleDomainUrl);
   net::CookieOptions options;
   options.set_include_httponly();  // The SID cookie might be httponly.
   std::string cookies = store->GetCookiesWithOptions(url, options);
   std::vector<std::string> cookie_list;
-  SplitString(cookies, kSplitStringToken, &cookie_list);
+  base::SplitString(cookies, kSplitStringToken, &cookie_list);
   for (std::vector<std::string>::iterator current = cookie_list.begin();
        current != cookie_list.end();
        ++current) {
     size_t position = (*current).find(kGoogleDomainSecureCookieId);
     if (0 == position)
       return true;
   }
   return false;
 }
 
@@ skipping 517 matching lines @@
     // If this is the first run then we place favorites with no labels
     // in the title bar.  Else they are placed in the "Google Toolbar" folder.
     if (!FirstRun::IsChromeFirstRun() || !label_vector[index].empty()) {
       (*bookmark_folders)[index].push_back(UTF16ToWide(bookmark_group_string));
     }
 
     // If the label and is in the form "xxx:yyy:zzz" this was created from an
     // IE or Firefox folder.  We undo the label creation and recreate the
     // correct folder.
     std::vector<std::wstring> folder_names;
-    SplitString(label_vector[index], L':', &folder_names);
+    base::SplitString(label_vector[index], L':', &folder_names);
     (*bookmark_folders)[index].insert((*bookmark_folders)[index].end(),
         folder_names.begin(), folder_names.end());
   }
 
   return true;
 }
 
 // Bookmark creation
 void  Toolbar5Importer::AddBookmarksToChrome(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
     const std::wstring& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
     int options = ProfileWriter::ADD_IF_UNIQUE |
         (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0);
     bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
   }
 }