diff options
135 files changed, 404 insertions, 381 deletions
diff --git a/chrome/browser/autocomplete/keyword_provider_unittest.cc b/chrome/browser/autocomplete/keyword_provider_unittest.cc index 8e5fc77..5757a65 100644 --- a/chrome/browser/autocomplete/keyword_provider_unittest.cc +++ b/chrome/browser/autocomplete/keyword_provider_unittest.cc @@ -94,8 +94,8 @@ void KeywordProviderTest::RunTest( } TEST_F(KeywordProviderTest, Edit) { - const MatchType<string16> kEmptyMatch = { base::string16(), false }; - TestData<string16> edit_cases[] = { + const MatchType<base::string16> kEmptyMatch = { base::string16(), false }; + TestData<base::string16> edit_cases[] = { // Searching for a nonexistent prefix should give nothing. { ASCIIToUTF16("Not Found"), 0, { kEmptyMatch, kEmptyMatch, kEmptyMatch } }, @@ -169,7 +169,7 @@ TEST_F(KeywordProviderTest, Edit) { { { ASCIIToUTF16("nonsub"), true }, kEmptyMatch, kEmptyMatch } }, }; - RunTest<string16>(edit_cases, arraysize(edit_cases), + RunTest<base::string16>(edit_cases, arraysize(edit_cases), &AutocompleteMatch::fill_into_edit); } @@ -209,8 +209,8 @@ TEST_F(KeywordProviderTest, URL) { } TEST_F(KeywordProviderTest, Contents) { - const MatchType<string16> kEmptyMatch = { base::string16(), false }; - TestData<string16> contents_cases[] = { + const MatchType<base::string16> kEmptyMatch = { base::string16(), false }; + TestData<base::string16> contents_cases[] = { // No query input -> substitute "<enter query>" into contents. { ASCIIToUTF16("z"), 1, { { ASCIIToUTF16("Search z for <enter query>"), true }, @@ -247,7 +247,7 @@ TEST_F(KeywordProviderTest, Contents) { { ASCIIToUTF16("Search aaaa for 1 2+ 3"), false } } }, }; - RunTest<string16>(contents_cases, arraysize(contents_cases), + RunTest<base::string16>(contents_cases, arraysize(contents_cases), &AutocompleteMatch::contents); } diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index a37ab42..51ce9ed 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -332,7 +332,7 @@ class SearchProvider : public AutocompleteProvider, typedef std::vector<SuggestResult> SuggestResults; typedef std::vector<NavigationResult> NavigationResults; typedef std::vector<history::KeywordSearchTermVisit> HistoryResults; - typedef std::pair<string16, std::string> MatchKey; + typedef std::pair<base::string16, std::string> MatchKey; typedef std::map<MatchKey, AutocompleteMatch> MatchMap; typedef ScopedVector<SuggestionDeletionHandler> SuggestionDeletionHandlers; diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index 7e1521c..b476f0f 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -252,7 +252,7 @@ ShortcutsProvider::WordMap ShortcutsProvider::CreateWordMapForString( base::i18n::BreakIterator::BREAK_WORD); if (!word_iter.Init()) return word_map; - std::vector<string16> words; + std::vector<base::string16> words; while (word_iter.Advance()) { if (word_iter.IsWord()) words.push_back(word_iter.GetString()); @@ -268,8 +268,8 @@ ShortcutsProvider::WordMap ShortcutsProvider::CreateWordMapForString( // is mandated in C++11, and part of that decision was based on a survey of // existing implementations that found that it was already true everywhere.) std::reverse(words.begin(), words.end()); - for (std::vector<string16>::const_iterator i(words.begin()); i != words.end(); - ++i) + for (std::vector<base::string16>::const_iterator i(words.begin()); + i != words.end(); ++i) word_map.insert(std::make_pair((*i)[0], *i)); return word_map; } diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 0157956..13a8b88 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -59,7 +59,7 @@ ExtensionNameComparator::ExtensionNameComparator(icu::Collator* collator) bool ExtensionNameComparator::operator()( const scoped_refptr<const Extension>& x, const scoped_refptr<const Extension>& y) { - return l10n_util::StringComparator<string16>(collator_)( + return l10n_util::StringComparator<base::string16>(collator_)( UTF8ToUTF16(x->name()), UTF8ToUTF16(y->name())); } diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h index cfbf927..70e9318 100644 --- a/chrome/browser/background/background_contents_service.h +++ b/chrome/browser/background/background_contents_service.h @@ -204,7 +204,8 @@ class BackgroundContentsService : private content::NotificationObserver, // applications. // Key: application id // Value: BackgroundContentsInfo for the BC associated with that application - typedef std::map<string16, BackgroundContentsInfo> BackgroundContentsMap; + typedef std::map<base::string16, BackgroundContentsInfo> + BackgroundContentsMap; BackgroundContentsMap contents_map_; DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService); diff --git a/chrome/browser/bookmarks/bookmark_index.cc b/chrome/browser/bookmarks/bookmark_index.cc index 81c2416..b4640d9 100644 --- a/chrome/browser/bookmarks/bookmark_index.cc +++ b/chrome/browser/bookmarks/bookmark_index.cc @@ -61,7 +61,7 @@ BookmarkIndex::~BookmarkIndex() { void BookmarkIndex::Add(const BookmarkNode* node) { if (!node->is_url()) return; - std::vector<string16> terms = ExtractQueryWords(node->GetTitle()); + std::vector<base::string16> terms = ExtractQueryWords(node->GetTitle()); for (size_t i = 0; i < terms.size(); ++i) RegisterNode(terms[i], node); } @@ -70,7 +70,7 @@ void BookmarkIndex::Remove(const BookmarkNode* node) { if (!node->is_url()) return; - std::vector<string16> terms = ExtractQueryWords(node->GetTitle()); + std::vector<base::string16> terms = ExtractQueryWords(node->GetTitle()); for (size_t i = 0; i < terms.size(); ++i) UnregisterNode(terms[i], node); } @@ -79,7 +79,7 @@ void BookmarkIndex::GetBookmarksWithTitlesMatching( const base::string16& query, size_t max_count, std::vector<BookmarkTitleMatch>* results) { - std::vector<string16> terms = ExtractQueryWords(query); + std::vector<base::string16> terms = ExtractQueryWords(query); if (terms.empty()) return; @@ -245,10 +245,11 @@ void BookmarkIndex::CombineMatches(const Index::const_iterator& index_i, } } -std::vector<string16> BookmarkIndex::ExtractQueryWords(const base::string16& query) { - std::vector<string16> terms; +std::vector<base::string16> BookmarkIndex::ExtractQueryWords( + const base::string16& query) { + std::vector<base::string16> terms; if (query.empty()) - return std::vector<string16>(); + return std::vector<base::string16>(); QueryParser parser; // TODO(brettw): use ICU normalization: // http://userguide.icu-project.org/transforms/normalization diff --git a/chrome/browser/bookmarks/bookmark_index.h b/chrome/browser/bookmarks/bookmark_index.h index a1d0867..f406268 100644 --- a/chrome/browser/bookmarks/bookmark_index.h +++ b/chrome/browser/bookmarks/bookmark_index.h @@ -51,7 +51,7 @@ class BookmarkIndex { private: typedef std::set<const BookmarkNode*> NodeSet; - typedef std::map<string16, NodeSet> Index; + typedef std::map<base::string16, NodeSet> Index; struct Match; typedef std::vector<Match> Matches; @@ -116,7 +116,7 @@ class BookmarkIndex { Matches* result); // Returns the set of query words from |query|. - std::vector<string16> ExtractQueryWords(const base::string16& query); + std::vector<base::string16> ExtractQueryWords(const base::string16& query); // Adds |node| to |index_|. void RegisterNode(const base::string16& term, const BookmarkNode* node); diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 5aa4f07..0c4cd01 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -63,7 +63,7 @@ bool MoreRecentlyModified(const BookmarkNode* n1, const BookmarkNode* n2) { // Returns true if |text| contains each string in |words|. This is used when // searching for bookmarks. bool DoesBookmarkTextContainWords(const base::string16& text, - const std::vector<string16>& words) { + const std::vector<base::string16>& words) { for (size_t i = 0; i < words.size(); ++i) { if (!base::i18n::StringSearchIgnoringCaseAndAccents( words[i], text, NULL, NULL)) { @@ -76,7 +76,7 @@ bool DoesBookmarkTextContainWords(const base::string16& text, // Returns true if |node|s title or url contains the strings in |words|. // |languages| argument is user's accept-language setting to decode IDN. bool DoesBookmarkContainWords(const BookmarkNode* node, - const std::vector<string16>& words, + const std::vector<base::string16>& words, const std::string& languages) { return DoesBookmarkTextContainWords(node->GetTitle(), words) || @@ -221,7 +221,7 @@ void GetBookmarksContainingText(BookmarkModel* model, size_t max_count, const std::string& languages, std::vector<const BookmarkNode*>* nodes) { - std::vector<string16> words; + std::vector<base::string16> words; QueryParser parser; parser.ParseQueryWords(base::i18n::ToLower(text), &words); if (words.empty()) diff --git a/chrome/browser/browsing_data/browsing_data_database_helper.cc b/chrome/browser/browsing_data/browsing_data_database_helper.cc index 8e9f6b8..891fe1b 100644 --- a/chrome/browser/browsing_data/browsing_data_database_helper.cc +++ b/chrome/browser/browsing_data/browsing_data_database_helper.cc @@ -81,9 +81,9 @@ void BrowsingDataDatabaseHelper::FetchDatabaseInfoOnFileThread() { // Non-websafe state is not considered browsing data. continue; } - std::vector<string16> databases; + std::vector<base::string16> databases; ori->GetAllDatabaseNames(&databases); - for (std::vector<string16>::const_iterator db = databases.begin(); + for (std::vector<base::string16>::const_iterator db = databases.begin(); db != databases.end(); ++db) { base::FilePath file_path = tracker_->GetFullDBFilePath(ori->GetOriginIdentifier(), *db); diff --git a/chrome/browser/chromeos/login/language_list.h b/chrome/browser/chromeos/login/language_list.h index 4edfb11..bf46190 100644 --- a/chrome/browser/chromeos/login/language_list.h +++ b/chrome/browser/chromeos/login/language_list.h @@ -47,12 +47,12 @@ class LanguageList { std::string locale_code; // E.g., en-us. }; - typedef std::map<string16, LocaleData> LocaleDataMap; + typedef std::map<base::string16, LocaleData> LocaleDataMap; void InitNativeNames(const std::vector<std::string>& locale_codes); // The names of all the locales in the current application locale. - std::vector<string16> locale_names_; + std::vector<base::string16> locale_names_; // A map of some extra data (LocaleData) keyed off the name of the locale. LocaleDataMap native_names_; diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index 3eafce0..4bab2d5 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -266,7 +266,7 @@ TEST_F(DownloadItemModelTest, InterruptTooltip) { // Check that if the width is small, the returned tooltip only contains // lines of the given width or smaller. - std::vector<string16> lines; + std::vector<base::string16> lines; base::string16 truncated_tooltip = model().GetTooltipText(font_list, kSmallTooltipWidth); Tokenize(truncated_tooltip, ASCIIToUTF16("\n"), &lines); diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index bd6aab1..abebc6a 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -50,7 +50,7 @@ template<> bool GetAs(const base::Value& in, std::string* out) { template<> bool GetAs(const base::Value& in, base::string16* out) { return in.GetAsString(out); } -template<> bool GetAs(const base::Value& in, std::vector<string16>* out) { +template<> bool GetAs(const base::Value& in, std::vector<base::string16>* out) { out->clear(); const base::ListValue* list = NULL; if (!in.GetAsList(&list)) @@ -70,7 +70,7 @@ template<> bool GetAs(const base::Value& in, std::vector<string16>* out) { // DownloadItem fields. static bool MatchesQuery( - const std::vector<string16>& query_terms, + const std::vector<base::string16>& query_terms, const DownloadItem& item) { DCHECK(!query_terms.empty()); base::string16 url_raw(UTF8ToUTF16(item.GetOriginalUrl().spec())); @@ -83,7 +83,7 @@ static bool MatchesQuery( } base::string16 path(item.GetTargetFilePath().LossyDisplayName()); - for (std::vector<string16>::const_iterator it = query_terms.begin(); + for (std::vector<base::string16>::const_iterator it = query_terms.begin(); it != query_terms.end(); ++it) { base::string16 term = base::i18n::ToLower(*it); if (!base::i18n::StringSearchIgnoringCaseAndAccents( @@ -275,7 +275,7 @@ bool DownloadQuery::AddFilter(DownloadQuery::FilterType type, case FILTER_EXISTS: return AddFilter(BuildFilter<bool>(value, EQ, &GetExists)); case FILTER_FILENAME: - return AddFilter(BuildFilter<string16>(value, EQ, &GetFilename)); + return AddFilter(BuildFilter<base::string16>(value, EQ, &GetFilename)); case FILTER_FILENAME_REGEX: return AddFilter(BuildRegexFilter(value, &GetFilenameUTF8)); case FILTER_MIME: @@ -283,7 +283,7 @@ bool DownloadQuery::AddFilter(DownloadQuery::FilterType type, case FILTER_PAUSED: return AddFilter(BuildFilter<bool>(value, EQ, &IsPaused)); case FILTER_QUERY: { - std::vector<string16> query_terms; + std::vector<base::string16> query_terms; return GetAs(value, &query_terms) && (query_terms.empty() || AddFilter(base::Bind(&MatchesQuery, query_terms))); @@ -399,7 +399,8 @@ void DownloadQuery::AddSorter(DownloadQuery::SortType type, sorters_.push_back(Sorter::Build<std::string>(direction, &GetUrl)); break; case SORT_FILENAME: - sorters_.push_back(Sorter::Build<string16>(direction, &GetFilename)); + sorters_.push_back( + Sorter::Build<base::string16>(direction, &GetFilename)); break; case SORT_DANGER: sorters_.push_back(Sorter::Build<DownloadDangerType>( diff --git a/chrome/browser/download/download_query.h b/chrome/browser/download/download_query.h index 533265a..7aaf4be 100644 --- a/chrome/browser/download/download_query.h +++ b/chrome/browser/download/download_query.h @@ -58,7 +58,7 @@ class DownloadQuery { FILTER_FILENAME_REGEX, // string FILTER_MIME, // string FILTER_PAUSED, // bool - FILTER_QUERY, // vector<string16> + FILTER_QUERY, // vector<base::string16> FILTER_STARTED_AFTER, // string FILTER_STARTED_BEFORE, // string FILTER_START_TIME, // string diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index c510e8b..a1c7528 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -632,7 +632,7 @@ void ModuleEnumerator::PreparePathMappings() { path_mapping_.clear(); scoped_ptr<base::Environment> environment(base::Environment::Create()); - std::vector<string16> env_vars; + std::vector<base::string16> env_vars; env_vars.push_back(L"LOCALAPPDATA"); env_vars.push_back(L"ProgramFiles"); env_vars.push_back(L"ProgramData"); @@ -641,7 +641,7 @@ void ModuleEnumerator::PreparePathMappings() { env_vars.push_back(L"TEMP"); env_vars.push_back(L"TMP"); env_vars.push_back(L"CommonProgramFiles"); - for (std::vector<string16>::const_iterator variable = env_vars.begin(); + for (std::vector<base::string16>::const_iterator variable = env_vars.begin(); variable != env_vars.end(); ++variable) { std::string path; if (environment->GetVar(WideToASCII(*variable).c_str(), &path)) { diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index 249cb82..a0a6b27 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -203,7 +203,7 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> { const base::FilePath& filename); // The typedef for the vector that maps a regular file path to %env_var%. - typedef std::vector< std::pair<string16, base::string16> > PathMapping; + typedef std::vector< std::pair<base::string16, base::string16> > PathMapping; // The vector of paths to %env_var%, used to account for differences in // where people keep there files, c:\windows vs. d:\windows, etc. diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index d64b755..636fc91 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -458,9 +458,9 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( VLOG(1) << " " << (*it)->id(); VLOG(1) << "Errors follow:"; - const std::vector<string16>* errors = + const std::vector<base::string16>* errors = ExtensionErrorReporter::GetInstance()->GetErrors(); - for (std::vector<string16>::const_iterator iter = errors->begin(); + for (std::vector<base::string16>::const_iterator iter = errors->begin(); iter != errors->end(); ++iter) VLOG(1) << *iter; diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index b91a286..32b540321 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -152,7 +152,7 @@ class ExtensionDisabledGlobalError : public GlobalErrorWithStandardBubble, virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; virtual gfx::Image GetBubbleViewIcon() OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; @@ -252,15 +252,16 @@ base::string16 ExtensionDisabledGlobalError::GetBubbleViewTitle() { UTF8ToUTF16(extension_->name())); } -std::vector<string16> ExtensionDisabledGlobalError::GetBubbleViewMessages() { - std::vector<string16> messages; +std::vector<base::string16> +ExtensionDisabledGlobalError::GetBubbleViewMessages() { + std::vector<base::string16> messages; messages.push_back(l10n_util::GetStringFUTF16( extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL : IDS_EXTENSION_DISABLED_ERROR_LABEL, UTF8ToUTF16(extension_->name()))); messages.push_back(l10n_util::GetStringUTF16( IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO)); - std::vector<string16> permission_warnings = + std::vector<base::string16> permission_warnings = extensions::PermissionMessageProvider::Get()->GetWarningMessages( extension_->GetActivePermissions(), extension_->GetType()); for (size_t i = 0; i < permission_warnings.size(); ++i) { diff --git a/chrome/browser/extensions/extension_error_reporter.cc b/chrome/browser/extensions/extension_error_reporter.cc index 618a8c8..dcbe45f 100644 --- a/chrome/browser/extensions/extension_error_reporter.cc +++ b/chrome/browser/extensions/extension_error_reporter.cc @@ -61,7 +61,7 @@ void ExtensionErrorReporter::ReportError(const base::string16& message, } } -const std::vector<string16>* ExtensionErrorReporter::GetErrors() { +const std::vector<base::string16>* ExtensionErrorReporter::GetErrors() { return &errors_; } diff --git a/chrome/browser/extensions/extension_error_reporter.h b/chrome/browser/extensions/extension_error_reporter.h index f2ee723..fbb4ddd 100644 --- a/chrome/browser/extensions/extension_error_reporter.h +++ b/chrome/browser/extensions/extension_error_reporter.h @@ -36,7 +36,7 @@ class ExtensionErrorReporter { void ReportError(const base::string16& message, bool be_noisy); // Get the errors that have been reported so far. - const std::vector<string16>* GetErrors(); + const std::vector<base::string16>* GetErrors(); // Clear the list of errors reported so far. void ClearErrors(); @@ -48,7 +48,7 @@ class ExtensionErrorReporter { ~ExtensionErrorReporter(); base::MessageLoop* ui_loop_; - std::vector<string16> errors_; + std::vector<base::string16> errors_; bool enable_noisy_errors_; }; diff --git a/chrome/browser/extensions/extension_error_ui.cc b/chrome/browser/extensions/extension_error_ui.cc index b70acf0..d908812 100644 --- a/chrome/browser/extensions/extension_error_ui.cc +++ b/chrome/browser/extensions/extension_error_ui.cc @@ -62,13 +62,13 @@ base::string16 ExtensionErrorUI::GenerateMessage() { IDS_APP_ALERT_ITEM_BLACKLISTED); } -std::vector<string16> ExtensionErrorUI::GetBubbleViewMessages() { +std::vector<base::string16> ExtensionErrorUI::GetBubbleViewMessages() { if (message_.empty()) { message_ = GenerateMessage(); if (message_[message_.size()-1] == '\n') message_.resize(message_.size()-1); } - return std::vector<string16>(1, message_); + return std::vector<base::string16>(1, message_); } base::string16 ExtensionErrorUI::GetBubbleViewTitle() { diff --git a/chrome/browser/extensions/extension_error_ui.h b/chrome/browser/extensions/extension_error_ui.h index 362c2df..c36bc9b 100644 --- a/chrome/browser/extensions/extension_error_ui.h +++ b/chrome/browser/extensions/extension_error_ui.h @@ -57,7 +57,7 @@ class ExtensionErrorUI { // Model methods for the bubble view. base::string16 GetBubbleViewTitle(); - std::vector<string16> GetBubbleViewMessages(); + std::vector<base::string16> GetBubbleViewMessages(); base::string16 GetBubbleViewAcceptButtonLabel(); base::string16 GetBubbleViewCancelButtonLabel(); diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h index 8475cb6..f8f97ff 100644 --- a/chrome/browser/extensions/extension_error_ui_default.h +++ b/chrome/browser/extensions/extension_error_ui_default.h @@ -36,7 +36,7 @@ class ExtensionErrorUIDefault : public ExtensionErrorUI { virtual base::string16 MenuItemLabel() OVERRIDE; virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 034947c..6690ae2 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -205,12 +205,12 @@ ExtensionInstallPrompt::Prompt::~Prompt() { } void ExtensionInstallPrompt::Prompt::SetPermissions( - const std::vector<string16>& permissions) { + const std::vector<base::string16>& permissions) { permissions_ = permissions; } void ExtensionInstallPrompt::Prompt::SetPermissionsDetails( - const std::vector<string16>& details) { + const std::vector<base::string16>& details) { details_ = details; is_showing_details_for_permissions_.clear(); for (size_t i = 0; i < details.size(); ++i) diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h index 772b66c..6bb5010 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h @@ -80,9 +80,9 @@ class ExtensionInstallPrompt ~Prompt(); // Sets the permission list for this prompt. - void SetPermissions(const std::vector<string16>& permissions); + void SetPermissions(const std::vector<base::string16>& permissions); // Sets the permission list details for this prompt. - void SetPermissionsDetails(const std::vector<string16>& details); + void SetPermissionsDetails(const std::vector<base::string16>& details); void SetIsShowingDetails(DetailsType type, size_t index, bool is_showing_details); @@ -158,8 +158,8 @@ class ExtensionInstallPrompt // Permissions that are being requested (may not be all of an extension's // permissions if only additional ones are being requested) - std::vector<string16> permissions_; - std::vector<string16> details_; + std::vector<base::string16> permissions_; + std::vector<base::string16> details_; std::vector<bool> is_showing_details_for_permissions_; std::vector<bool> is_showing_details_for_oauth_; bool is_showing_details_for_retained_files_; diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 4308d20..a0b3c69 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -186,12 +186,12 @@ struct ExtensionsOrder { } }; -static std::vector<string16> GetErrors() { - const std::vector<string16>* errors = +static std::vector<base::string16> GetErrors() { + const std::vector<base::string16>* errors = ExtensionErrorReporter::GetInstance()->GetErrors(); - std::vector<string16> ret_val; + std::vector<base::string16> ret_val; - for (std::vector<string16>::const_iterator iter = errors->begin(); + for (std::vector<base::string16>::const_iterator iter = errors->begin(); iter != errors->end(); ++iter) { std::string utf8_error = UTF16ToUTF8(*iter); if (utf8_error.find(".svn") == std::string::npos) { @@ -862,7 +862,7 @@ class ExtensionServiceTest const Extension* VerifyCrxInstall(const base::FilePath& path, InstallState install_state, const std::string& expected_old_name) { - std::vector<string16> errors = GetErrors(); + std::vector<base::string16> errors = GetErrors(); const Extension* extension = NULL; if (install_state != INSTALL_FAILED) { if (install_state == INSTALL_NEW) @@ -890,7 +890,7 @@ class ExtensionServiceTest << path.value(); } - for (std::vector<string16>::iterator err = errors.begin(); + for (std::vector<base::string16>::iterator err = errors.begin(); err != errors.end(); ++err) { LOG(ERROR) << *err; } @@ -971,7 +971,7 @@ class ExtensionServiceTest else base::RunLoop().RunUntilIdle(); - std::vector<string16> errors = GetErrors(); + std::vector<base::string16> errors = GetErrors(); int error_count = errors.size(); int enabled_extension_count = service_->extensions()->size(); @@ -1973,7 +1973,7 @@ TEST_F(ExtensionServiceTest, InstallUserScript) { GURL("http://www.aaronboodman.com/scripts/user_script_basic.user.js")); base::RunLoop().RunUntilIdle(); - std::vector<string16> errors = GetErrors(); + std::vector<base::string16> errors = GetErrors(); EXPECT_TRUE(installed_) << "Nothing was installed."; EXPECT_FALSE(was_update_) << path.value(); ASSERT_EQ(1u, loaded_.size()) << "Nothing was loaded."; diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index c61a0de..7faeef5 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -183,7 +183,7 @@ std::string ExtensionWarning::GetLocalizedMessage( // These parameters may be unsafe (URLs and Extension names) and need // to be HTML-escaped before being embedded in the UI. Also extension IDs // are translated to full extension names. - std::vector<string16> final_parameters; + std::vector<base::string16> final_parameters; for (size_t i = 0; i < message_parameters_.size(); ++i) { std::string message = message_parameters_[i]; if (StartsWithASCII(message, kTranslate, true)) { diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc index 628e653..d723182 100644 --- a/chrome/browser/extensions/external_install_ui.cc +++ b/chrome/browser/extensions/external_install_ui.cc @@ -107,7 +107,7 @@ class ExternalInstallMenuAlert : public GlobalErrorWithStandardBubble, virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; virtual bool HasBubbleView() OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; @@ -138,7 +138,7 @@ class ExternalInstallGlobalError : public ExternalInstallMenuAlert { virtual bool HasBubbleView() OVERRIDE; virtual gfx::Image GetBubbleViewIcon() OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; @@ -285,8 +285,8 @@ base::string16 ExternalInstallMenuAlert::GetBubbleViewTitle() { return base::string16(); } -std::vector<string16> ExternalInstallMenuAlert::GetBubbleViewMessages() { - return std::vector<string16>(); +std::vector<base::string16> ExternalInstallMenuAlert::GetBubbleViewMessages() { + return std::vector<base::string16>(); } base::string16 ExternalInstallMenuAlert::GetBubbleViewAcceptButtonLabel() { @@ -368,8 +368,9 @@ base::string16 ExternalInstallGlobalError::GetBubbleViewTitle() { return prompt_->GetDialogTitle(); } -std::vector<string16> ExternalInstallGlobalError::GetBubbleViewMessages() { - std::vector<string16> messages; +std::vector<base::string16> +ExternalInstallGlobalError::GetBubbleViewMessages() { + std::vector<base::string16> messages; messages.push_back(prompt_->GetHeading()); if (prompt_->GetPermissionCount()) { messages.push_back(prompt_->GetPermissionsHeading()); diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 00366b9..9ca9622 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -54,7 +54,7 @@ void ExternalRegistryLoader::LoadOnFileThread() { scoped_ptr<DictionaryValue> prefs(new DictionaryValue); // A map of IDs, to weed out duplicates between HKCU and HKLM. - std::set<string16> keys; + std::set<base::string16> keys; base::win::RegistryKeyIterator iterator_machine_key( HKEY_LOCAL_MACHINE, ASCIIToWide(kRegistryExtensions).c_str()); for (; iterator_machine_key.Valid(); ++iterator_machine_key) @@ -67,7 +67,7 @@ void ExternalRegistryLoader::LoadOnFileThread() { // Iterate over the keys found, first trying HKLM, then HKCU, as per Windows // policy conventions. We only fall back to HKCU if the HKLM key cannot be // opened, not if the data within the key is invalid, for example. - for (std::set<string16>::const_iterator it = keys.begin(); + for (std::set<base::string16>::const_iterator it = keys.begin(); it != keys.end(); ++it) { base::win::RegKey key; base::string16 key_path = ASCIIToWide(kRegistryExtensions); diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index 45c9dd1..3d3a7dd 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -151,12 +151,12 @@ base::string16 SuspiciousExtensionBubbleController::GetDismissButtonLabel() { return l10n_util::GetStringUTF16(IDS_EXTENSIONS_SUSPICIOUS_DISABLED_BUTTON); } -std::vector<string16> +std::vector<base::string16> SuspiciousExtensionBubbleController::GetSuspiciousExtensionNames() { if (suspicious_extensions_.empty()) - return std::vector<string16>(); + return std::vector<base::string16>(); - std::vector<string16> return_value; + std::vector<base::string16> return_value; for (ExtensionIdList::const_iterator it = suspicious_extensions_.begin(); it != suspicious_extensions_.end(); ++it) { const Extension* extension = service_->GetInstalledExtension(*it); diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.h b/chrome/browser/extensions/suspicious_extension_bubble_controller.h index 7cd7aa7..304f7c8 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.h +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.h @@ -43,7 +43,7 @@ class SuspiciousExtensionBubbleController : public ProfileKeyedAPI { base::string16 GetDismissButtonLabel(); // Returns a vector of names of suspicious extensions found. - std::vector<string16> GetSuspiciousExtensionNames(); + std::vector<base::string16> GetSuspiciousExtensionNames(); // Callbacks from bubble. Declared virtual for testing purposes. virtual void OnBubbleDismiss(); diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc index 6920797..194be47 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller_unittest.cc @@ -185,7 +185,7 @@ TEST_F(SuspiciousExtensionBubbleTest, MAYBE_ControllerTest) { EXPECT_FALSE(prefs->HasWipeoutBeenAcknowledged(extension_id2)); EXPECT_FALSE(controller->HasSuspiciousExtensions()); - std::vector<string16> suspicious_extensions = + std::vector<base::string16> suspicious_extensions = controller->GetSuspiciousExtensionNames(); EXPECT_EQ(0U, suspicious_extensions.size()); EXPECT_EQ(0U, controller->link_click_count()); diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 15d63c7..b4f78e2 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -232,7 +232,7 @@ void FileSelectHelper::OnListDone(int id, int error) { scoped_ptr<ui::SelectFileDialog::FileTypeInfo> FileSelectHelper::GetFileTypesFromAcceptType( - const std::vector<string16>& accept_types) { + const std::vector<base::string16>& accept_types) { scoped_ptr<ui::SelectFileDialog::FileTypeInfo> base_file_type( new ui::SelectFileDialog::FileTypeInfo()); if (accept_types.empty()) @@ -397,7 +397,7 @@ void FileSelectHelper::RunFileChooserOnUIThread( #if defined(OS_ANDROID) // Android needs the original MIME types and an additional capture value. - std::pair<std::vector<string16>, bool> accept_types = + std::pair<std::vector<base::string16>, bool> accept_types = std::make_pair(params.accept_types, params.capture); #endif diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h index 0c2c9b4..5568478 100644 --- a/chrome/browser/file_select_helper.h +++ b/chrome/browser/file_select_helper.h @@ -127,7 +127,8 @@ class FileSelectHelper // |accept_types| contains only valid lowercased MIME types or file extensions // beginning with a period (.). static scoped_ptr<ui::SelectFileDialog::FileTypeInfo> - GetFileTypesFromAcceptType(const std::vector<string16>& accept_types); + GetFileTypesFromAcceptType( + const std::vector<base::string16>& accept_types); // Check the accept type is valid. It is expected to be all lower case with // no whitespace. diff --git a/chrome/browser/history/android/android_history_provider_service.cc b/chrome/browser/history/android/android_history_provider_service.cc index 4fc6c2b..0367a3d 100644 --- a/chrome/browser/history/android/android_history_provider_service.cc +++ b/chrome/browser/history/android/android_history_provider_service.cc @@ -22,7 +22,7 @@ AndroidHistoryProviderService::Handle AndroidHistoryProviderService::QueryHistoryAndBookmarks( const std::vector<history::HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order, CancelableRequestConsumerBase* consumer, const QueryCallback& callback) { @@ -44,7 +44,7 @@ AndroidHistoryProviderService::Handle AndroidHistoryProviderService::UpdateHistoryAndBookmarks( const history::HistoryAndBookmarkRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const UpdateCallback& callback) { UpdateRequest* request = new UpdateRequest(callback); @@ -64,7 +64,7 @@ AndroidHistoryProviderService::UpdateHistoryAndBookmarks( AndroidHistoryProviderService::Handle AndroidHistoryProviderService::DeleteHistoryAndBookmarks( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const DeleteCallback& callback) { DeleteRequest* request = new DeleteRequest(callback); @@ -102,7 +102,7 @@ AndroidHistoryProviderService::InsertHistoryAndBookmark( AndroidHistoryProviderService::Handle AndroidHistoryProviderService::DeleteHistory( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const DeleteCallback& callback) { DeleteRequest* request = new DeleteRequest(callback); @@ -174,7 +174,7 @@ AndroidHistoryProviderService::Handle AndroidHistoryProviderService::UpdateSearchTerms( const history::SearchRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const UpdateCallback& callback) { UpdateRequest* request = new UpdateRequest(callback); @@ -194,7 +194,7 @@ AndroidHistoryProviderService::UpdateSearchTerms( AndroidHistoryProviderService::Handle AndroidHistoryProviderService::DeleteSearchTerms( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const DeleteCallback& callback) { DeleteRequest* request = new DeleteRequest(callback); @@ -215,7 +215,7 @@ AndroidHistoryProviderService::Handle AndroidHistoryProviderService::QuerySearchTerms( const std::vector<history::SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order, CancelableRequestConsumerBase* consumer, const QueryCallback& callback) { diff --git a/chrome/browser/history/android/android_history_provider_service.h b/chrome/browser/history/android/android_history_provider_service.h index 0700d09..0b57b0c 100644 --- a/chrome/browser/history/android/android_history_provider_service.h +++ b/chrome/browser/history/android/android_history_provider_service.h @@ -69,7 +69,7 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { Handle QueryHistoryAndBookmarks( const std::vector<history::HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order, CancelableRequestConsumerBase* consumer, const QueryCallback& callback); @@ -80,11 +80,12 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { // |row| is the value to update. // |selection| is the SQL WHERE clause without 'WHERE'. // |selection_args| is the arguments for the WHERE clause. - Handle UpdateHistoryAndBookmarks(const history::HistoryAndBookmarkRow& row, - const std::string& selection, - const std::vector<string16>& selection_args, - CancelableRequestConsumerBase* consumer, - const UpdateCallback& callback); + Handle UpdateHistoryAndBookmarks( + const history::HistoryAndBookmarkRow& row, + const std::string& selection, + const std::vector<base::string16>& selection_args, + CancelableRequestConsumerBase* consumer, + const UpdateCallback& callback); // Deletes the specified rows and invokes the |callback| to return the number // of row deleted on success. @@ -93,10 +94,11 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { // |selection_args| is the arguments for the WHERE clause. // // if |selection| is empty all history and bookmarks are deleted. - Handle DeleteHistoryAndBookmarks(const std::string& selection, - const std::vector<string16>& selection_args, - CancelableRequestConsumerBase* consumer, - const DeleteCallback& callback); + Handle DeleteHistoryAndBookmarks( + const std::string& selection, + const std::vector<base::string16>& selection_args, + CancelableRequestConsumerBase* consumer, + const DeleteCallback& callback); // Inserts the given values into history backend, and invokes the |callback| // to return the result. @@ -107,7 +109,7 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { // Deletes the matched history and invokes |callback| to return the number of // the row deleted from the |callback|. Handle DeleteHistory(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const DeleteCallback& callback); @@ -140,7 +142,7 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { // |selection_args| is the arguments for WHERE clause. Handle UpdateSearchTerms(const history::SearchRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const UpdateCallback& callback); @@ -151,7 +153,7 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { // // if |selection| is empty all search be deleted. Handle DeleteSearchTerms(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, CancelableRequestConsumerBase* consumer, const DeleteCallback& callback); @@ -164,7 +166,7 @@ class AndroidHistoryProviderService : public CancelableRequestProvider { Handle QuerySearchTerms( const std::vector<history::SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order, CancelableRequestConsumerBase* consumer, const QueryCallback& callback); diff --git a/chrome/browser/history/android/android_history_provider_service_unittest.cc b/chrome/browser/history/android/android_history_provider_service_unittest.cc index e83d746..0f48c23 100644 --- a/chrome/browser/history/android/android_history_provider_service_unittest.cc +++ b/chrome/browser/history/android/android_history_provider_service_unittest.cc @@ -170,7 +170,7 @@ TEST_F(AndroidHistoryProviderServiceTest, TestHistoryAndBookmark) { // Query the inserted row. service_->QueryHistoryAndBookmarks(projections, std::string(), - std::vector<string16>(), std::string(), &cancelable_consumer_, + std::vector<base::string16>(), std::string(), &cancelable_consumer_, Bind(&CallbackHelper::OnQueryResult, callback.get())); base::MessageLoop::current()->Run(); ASSERT_TRUE(callback->success()); @@ -190,14 +190,15 @@ TEST_F(AndroidHistoryProviderServiceTest, TestHistoryAndBookmark) { HistoryAndBookmarkRow update_row; update_row.set_visit_count(3); service_->UpdateHistoryAndBookmarks(update_row, std::string(), - std::vector<string16>(), &cancelable_consumer_, + std::vector<base::string16>(), &cancelable_consumer_, Bind(&CallbackHelper::OnUpdated, callback.get())); base::MessageLoop::current()->Run(); EXPECT_TRUE(callback->success()); EXPECT_EQ(1, callback->count()); // Delete the row. - service_->DeleteHistoryAndBookmarks(std::string(), std::vector<string16>(), + service_->DeleteHistoryAndBookmarks(std::string(), + std::vector<base::string16>(), &cancelable_consumer_, Bind(&CallbackHelper::OnDeleted, callback.get())); base::MessageLoop::current()->Run(); EXPECT_TRUE(callback->success()); @@ -225,7 +226,7 @@ TEST_F(AndroidHistoryProviderServiceTest, TestSearchTerm) { // Query the inserted row. service_->QuerySearchTerms(projections, std::string(), - std::vector<string16>(), std::string(), &cancelable_consumer_, + std::vector<base::string16>(), std::string(), &cancelable_consumer_, Bind(&CallbackHelper::OnQueryResult, callback.get())); base::MessageLoop::current()->Run(); ASSERT_TRUE(callback->success()); @@ -245,14 +246,14 @@ TEST_F(AndroidHistoryProviderServiceTest, TestSearchTerm) { SearchRow update_row; update_row.set_search_time(Time::Now()); service_->UpdateSearchTerms(update_row, std::string(), - std::vector<string16>(), &cancelable_consumer_, + std::vector<base::string16>(), &cancelable_consumer_, Bind(&CallbackHelper::OnUpdated, callback.get())); base::MessageLoop::current()->Run(); EXPECT_TRUE(callback->success()); EXPECT_EQ(1, callback->count()); // Delete the row. - service_->DeleteSearchTerms(std::string(), std::vector<string16>(), + service_->DeleteSearchTerms(std::string(), std::vector<base::string16>(), &cancelable_consumer_, Bind(&CallbackHelper::OnDeleted, callback.get())); base::MessageLoop::current()->Run(); EXPECT_TRUE(callback->success()); diff --git a/chrome/browser/history/android/android_provider_backend.cc b/chrome/browser/history/android/android_provider_backend.cc index 599e9dc..0fce555 100644 --- a/chrome/browser/history/android/android_provider_backend.cc +++ b/chrome/browser/history/android/android_provider_backend.cc @@ -59,10 +59,10 @@ const char* kSearchTermUpdateClause = "(keyword_search_terms.url_id = urls.id) " "GROUP BY keyword_search_terms.term"; -void BindStatement(const std::vector<string16>& selection_args, +void BindStatement(const std::vector<base::string16>& selection_args, sql::Statement* statement, int* col_index) { - for (std::vector<string16>::const_iterator i = selection_args.begin(); + for (std::vector<base::string16>::const_iterator i = selection_args.begin(); i != selection_args.end(); ++i) { // Using the same method as Android, binding all argument as String. statement->BindString16(*col_index, *i); @@ -137,7 +137,7 @@ AndroidProviderBackend::~AndroidProviderBackend() { AndroidStatement* AndroidProviderBackend::QueryHistoryAndBookmarks( const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order) { if (projections.empty()) return NULL; @@ -156,7 +156,7 @@ AndroidStatement* AndroidProviderBackend::QueryHistoryAndBookmarks( bool AndroidProviderBackend::UpdateHistoryAndBookmarks( const HistoryAndBookmarkRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* updated_count) { HistoryNotifications notifications; @@ -188,7 +188,7 @@ AndroidURLID AndroidProviderBackend::InsertHistoryAndBookmark( bool AndroidProviderBackend::DeleteHistoryAndBookmarks( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* deleted_count) { HistoryNotifications notifications; @@ -205,7 +205,7 @@ bool AndroidProviderBackend::DeleteHistoryAndBookmarks( bool AndroidProviderBackend::DeleteHistory( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* deleted_count) { HistoryNotifications notifications; @@ -290,7 +290,7 @@ void AndroidProviderBackend::ScopedTransaction::Commit() { bool AndroidProviderBackend::UpdateHistoryAndBookmarks( const HistoryAndBookmarkRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* updated_count, HistoryNotifications* notifications) { if (!IsHistoryAndBookmarkRowValid(row)) @@ -412,7 +412,7 @@ AndroidURLID AndroidProviderBackend::InsertHistoryAndBookmark( bool AndroidProviderBackend::DeleteHistoryAndBookmarks( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int * deleted_count, HistoryNotifications* notifications) { if (!EnsureInitializedAndUpdated()) @@ -437,7 +437,7 @@ bool AndroidProviderBackend::DeleteHistoryAndBookmarks( bool AndroidProviderBackend::DeleteHistory( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* deleted_count, HistoryNotifications* notifications) { if (!EnsureInitializedAndUpdated()) @@ -494,7 +494,7 @@ bool AndroidProviderBackend::DeleteHistory( AndroidStatement* AndroidProviderBackend::QuerySearchTerms( const std::vector<SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order) { if (projections.empty()) return NULL; @@ -532,7 +532,7 @@ AndroidStatement* AndroidProviderBackend::QuerySearchTerms( bool AndroidProviderBackend::UpdateSearchTerms( const SearchRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* update_count) { if (!EnsureInitializedAndUpdated()) return false; @@ -631,7 +631,7 @@ SearchTermID AndroidProviderBackend::InsertSearchTerm( bool AndroidProviderBackend::DeleteSearchTerms( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int * deleted_count) { if (!EnsureInitializedAndUpdated()) return false; @@ -872,7 +872,7 @@ int AndroidProviderBackend::AppendBookmarkResultColumn( bool AndroidProviderBackend::GetSelectedURLs( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, TableIDRows* rows) { std::string sql("SELECT url_id, urls_url, bookmark FROM ("); sql.append(kVirtualHistoryAndBookmarkTable); @@ -902,7 +902,7 @@ bool AndroidProviderBackend::GetSelectedURLs( bool AndroidProviderBackend::GetSelectedSearchTerms( const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, SearchTerms* rows) { std::string sql("SELECT search " "FROM android_cache_db.search_terms "); @@ -963,7 +963,7 @@ bool AndroidProviderBackend::SimulateUpdateURL( scoped_ptr<AndroidStatement> statement; statement.reset(QueryHistoryAndBookmarksInternal(projections, oss.str(), - std::vector<string16>(), std::string())); + std::vector<base::string16>(), std::string())); if (!statement.get() || !statement->statement()->Step()) return false; @@ -1069,7 +1069,7 @@ bool AndroidProviderBackend::SimulateUpdateURL( AndroidStatement* AndroidProviderBackend::QueryHistoryAndBookmarksInternal( const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order) { std::string sql; sql.append("SELECT "); diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h index 8db9fcb..d3cec73 100644 --- a/chrome/browser/history/android/android_provider_backend.h +++ b/chrome/browser/history/android/android_provider_backend.h @@ -65,7 +65,7 @@ class AndroidProviderBackend { AndroidStatement* QueryHistoryAndBookmarks( const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order); // Runs the given update and returns the number of the updated rows in @@ -74,10 +74,11 @@ class AndroidProviderBackend { // |row| is the value to update. // |selection| is the SQL WHERE clause without 'WHERE'. // |selection_args| is the arguments for the WHERE clause. - bool UpdateHistoryAndBookmarks(const HistoryAndBookmarkRow& row, - const std::string& selection, - const std::vector<string16>& selection_args, - int* update_count); + bool UpdateHistoryAndBookmarks( + const HistoryAndBookmarkRow& row, + const std::string& selection, + const std::vector<base::string16>& selection_args, + int* update_count); // Inserts the given values and returns the URLID of the inserted row. AndroidURLID InsertHistoryAndBookmark(const HistoryAndBookmarkRow& values); @@ -88,16 +89,17 @@ class AndroidProviderBackend { // |selection_args| is the arguments for the WHERE clause. // // if |selection| is empty all history and bookmarks are deleted. - bool DeleteHistoryAndBookmarks(const std::string& selection, - const std::vector<string16>& selection_args, - int* deleted_count); + bool DeleteHistoryAndBookmarks( + const std::string& selection, + const std::vector<base::string16>& selection_args, + int* deleted_count); // Deletes the matched history, returns true on success, false on error. // The number of deleted row is returned in |deleted_count|. // The url row is kept and the visit count is reset if the matched url // is bookmarked. bool DeleteHistory(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* deleted_count); // SearchTerms -------------------------------------------------------------- @@ -111,7 +113,7 @@ class AndroidProviderBackend { AndroidStatement* QuerySearchTerms( const std::vector<SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order); // Runs the given update and returns the number of updated rows in @@ -122,7 +124,7 @@ class AndroidProviderBackend { // |selection_args| is the arguments for WHERE clause. bool UpdateSearchTerms(const SearchRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* update_count); // Inserts the given valus and return the SearchTermID of inserted row. @@ -135,7 +137,7 @@ class AndroidProviderBackend { // // if |selection| is empty all search be deleted. bool DeleteSearchTerms(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int * deleted_count); private: @@ -200,7 +202,7 @@ class AndroidProviderBackend { // |selection_args| is the arguments for the WHERE clause. bool UpdateHistoryAndBookmarks(const HistoryAndBookmarkRow& row, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* update_count, HistoryNotifications* notifications); @@ -221,10 +223,11 @@ class AndroidProviderBackend { // The notifications are returned in |notifications| and the ownership of them // is transfered to the caller. // if |selection| is empty all history and bookmarks are deleted. - bool DeleteHistoryAndBookmarks(const std::string& selection, - const std::vector<string16>& selection_args, - int* deleted_count, - HistoryNotifications* notifications); + bool DeleteHistoryAndBookmarks( + const std::string& selection, + const std::vector<base::string16>& selection_args, + int* deleted_count, + HistoryNotifications* notifications); // Deletes the matched history, returns true on success, false on error. // The number of deleted row is returned in |deleted_count|. @@ -233,7 +236,7 @@ class AndroidProviderBackend { // The url row is kept and the visit is reset if the matched url is // bookmarked. bool DeleteHistory(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, int* deleted_count, HistoryNotifications* notifications); @@ -278,14 +281,14 @@ class AndroidProviderBackend { // Runs the given query on history_bookmark virtual table and returns true if // succeeds, the selected URLID and url are returned in |rows|. bool GetSelectedURLs(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, TableIDRows* rows); // Runs the given query on search_terms table and returns true on success, // The selected search term are returned in |rows|. - typedef std::vector<string16> SearchTerms; + typedef std::vector<base::string16> SearchTerms; bool GetSelectedSearchTerms(const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, SearchTerms* rows); // Simulates update url by deleting the previous URL and creating a new one. @@ -299,7 +302,7 @@ class AndroidProviderBackend { AndroidStatement* QueryHistoryAndBookmarksInternal( const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order); // Delete the given urls' history, returns true on success, or false on error. diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index 16145f1..25a022a 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -435,7 +435,7 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); ASSERT_EQ(url1, GURL(statement->statement()->ColumnString(1))); @@ -469,14 +469,14 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) { // Query by bookmark statement.reset(backend->QueryHistoryAndBookmarks(projections, "bookmark=1", - std::vector<string16>(), std::string("url ASC"))); + std::vector<base::string16>(), std::string("url ASC"))); // Only URL1 is returned. ASSERT_TRUE(statement->statement()->Step()); ASSERT_EQ(url1, GURL(statement->statement()->ColumnString(1))); EXPECT_FALSE(statement->statement()->Step()); statement.reset(backend->QueryHistoryAndBookmarks(projections, "bookmark=0", - std::vector<string16>(), std::string("url ASC"))); + std::vector<base::string16>(), std::string("url ASC"))); // Only URL2 is returned. ASSERT_TRUE(statement->statement()->Step()); ASSERT_EQ(url2, GURL(statement->statement()->ColumnString(1))); @@ -554,7 +554,7 @@ TEST_F(AndroidProviderBackendTest, InsertHistoryAndBookmark) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); ASSERT_EQ(row1.raw_url(), statement->statement()->ColumnString(1)); @@ -629,7 +629,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) { EXPECT_EQ(row1.url(), child->url()); // Delete the row1. - std::vector<string16> args; + std::vector<base::string16> args; int deleted_count = 0; delegate_.ResetDetails(); ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("Favicon IS NULL", args, @@ -661,7 +661,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); @@ -685,7 +685,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) { // Delete row2. delegate_.ResetDetails(); ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("bookmark = 0", - std::vector<string16>(), &deleted_count)); + std::vector<base::string16>(), &deleted_count)); // Verify notifications ASSERT_TRUE(delegate_.deleted_details()); EXPECT_FALSE(delegate_.modified_details()); @@ -702,7 +702,7 @@ TEST_F(AndroidProviderBackendTest, DeleteHistoryAndBookmarks) { ASSERT_EQ(1, deleted_count); scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_FALSE(statement1->statement()->Step()); } @@ -832,7 +832,7 @@ TEST_F(AndroidProviderBackendTest, UpdateURL) { ASSERT_EQ(1u, visits.size()); int update_count; - std::vector<string16> update_args; + std::vector<base::string16> update_args; // Try to update the mutiple rows with the same URL, this should failed. HistoryAndBookmarkRow update_row1; update_row1.set_raw_url("newwebiste.com"); @@ -989,7 +989,7 @@ TEST_F(AndroidProviderBackendTest, UpdateVisitCount) { ASSERT_TRUE(id2); int update_count; - std::vector<string16> update_args; + std::vector<base::string16> update_args; // Update the visit_count to a value less than current one. HistoryAndBookmarkRow update_row1; update_row1.set_visit_count(5); @@ -1069,7 +1069,7 @@ TEST_F(AndroidProviderBackendTest, UpdateLastVisitTime) { ASSERT_TRUE(id2); int update_count; - std::vector<string16> update_args; + std::vector<base::string16> update_args; // Update the last visit time to a value greater than current one. HistoryAndBookmarkRow update_row1; update_row1.set_last_visit_time(Time::Now()); @@ -1128,7 +1128,7 @@ TEST_F(AndroidProviderBackendTest, UpdateFavicon) { ASSERT_TRUE(id1); int update_count; - std::vector<string16> update_args; + std::vector<base::string16> update_args; // Update the last visit time to a value greater than current one. HistoryAndBookmarkRow update_row1; @@ -1283,7 +1283,8 @@ TEST_F(AndroidProviderBackendTest, QuerySearchTerms) { projections.push_back(SearchRow::SEARCH_TERM); projections.push_back(SearchRow::SEARCH_TIME); scoped_ptr<AndroidStatement> statement(backend->QuerySearchTerms( - projections, std::string(), std::vector<string16>(), std::string())); + projections, std::string(), std::vector<base::string16>(), + std::string())); ASSERT_TRUE(statement.get()); ASSERT_TRUE(statement->statement()->Step()); EXPECT_TRUE(statement->statement()->ColumnInt64(0)); @@ -1316,7 +1317,7 @@ TEST_F(AndroidProviderBackendTest, UpdateSearchTerms) { projections.push_back(SearchRow::ID); projections.push_back(SearchRow::SEARCH_TIME); projections.push_back(SearchRow::SEARCH_TERM); - std::vector<string16> args; + std::vector<base::string16> args; args.push_back(term); scoped_ptr<AndroidStatement> statement(backend->QuerySearchTerms( projections, "search = ?", args, std::string())); @@ -1420,7 +1421,7 @@ TEST_F(AndroidProviderBackendTest, DeleteSearchTerms) { projections.push_back(SearchRow::ID); projections.push_back(SearchRow::SEARCH_TIME); projections.push_back(SearchRow::SEARCH_TERM); - std::vector<string16> args; + std::vector<base::string16> args; args.push_back(term); scoped_ptr<AndroidStatement> statement(backend->QuerySearchTerms( projections, "search = ?", args, std::string())); @@ -1522,7 +1523,7 @@ TEST_F(AndroidProviderBackendTest, InsertSearchTerm) { projections.push_back(SearchRow::ID); projections.push_back(SearchRow::SEARCH_TIME); projections.push_back(SearchRow::SEARCH_TERM); - std::vector<string16> args; + std::vector<base::string16> args; std::ostringstream oss; oss << id; args.push_back(UTF8ToUTF16(oss.str())); @@ -1579,7 +1580,8 @@ TEST_F(AndroidProviderBackendTest, DeleteHistory) { // Delete history int deleted_count = 0; - ASSERT_TRUE(backend->DeleteHistory(std::string(), std::vector<string16>(), + ASSERT_TRUE(backend->DeleteHistory(std::string(), + std::vector<base::string16>(), &deleted_count)); EXPECT_EQ(2, deleted_count); // The row2 was deleted. @@ -1682,7 +1684,7 @@ TEST_F(AndroidProviderBackendTest, TestAndroidCTSComplianceForZeroVisitCount) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); @@ -1733,7 +1735,7 @@ TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) { projections.push_back(HistoryAndBookmarkRow::URL); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string("folder=0"), std::vector<string16>(), + projections, std::string("folder=0"), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); EXPECT_EQ(row1.raw_url(), statement->statement()->ColumnString(0)); @@ -1741,7 +1743,7 @@ TEST_F(AndroidProviderBackendTest, AndroidCTSComplianceFolderColumnExists) { // Query by folder=1, the row2 should returned. statement.reset(backend->QueryHistoryAndBookmarks( - projections, std::string("folder=1"), std::vector<string16>(), + projections, std::string("folder=1"), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0))); @@ -1833,7 +1835,7 @@ TEST_F(AndroidProviderBackendTest, QueryWithoutThumbnailDB) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_TRUE(statement->statement()->Step()); ASSERT_EQ(url1, GURL(statement->statement()->ColumnString(1))); @@ -1971,7 +1973,7 @@ TEST_F(AndroidProviderBackendTest, DeleteWithoutThumbnailDB) { NULL, bookmark_model_, &delegate_)); // Delete all rows. - std::vector<string16> args; + std::vector<base::string16> args; int deleted_count = 0; delegate_.ResetDetails(); ASSERT_TRUE(backend->DeleteHistoryAndBookmarks("Favicon IS NULL", args, @@ -2001,7 +2003,7 @@ TEST_F(AndroidProviderBackendTest, DeleteWithoutThumbnailDB) { projections.push_back(HistoryAndBookmarkRow::BOOKMARK); scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks( - projections, std::string(), std::vector<string16>(), + projections, std::string(), std::vector<base::string16>(), std::string("url ASC"))); ASSERT_FALSE(statement1->statement()->Step()); } @@ -2035,7 +2037,7 @@ TEST_F(AndroidProviderBackendTest, UpdateFaviconWithoutThumbnail) { bookmark_model_, &delegate_)); int update_count; - std::vector<string16> update_args; + std::vector<base::string16> update_args; // Update the last visit time to a value greater than current one. HistoryAndBookmarkRow update_row1; diff --git a/chrome/browser/history/android/sqlite_cursor_unittest.cc b/chrome/browser/history/android/sqlite_cursor_unittest.cc index 46f0f00..9279026 100644 --- a/chrome/browser/history/android/sqlite_cursor_unittest.cc +++ b/chrome/browser/history/android/sqlite_cursor_unittest.cc @@ -179,7 +179,7 @@ TEST_F(SQLiteCursorTest, Run) { // Query the inserted row. service_->QueryHistoryAndBookmarks(projections, std::string(), - std::vector<string16>(), std::string(), &cancelable_consumer_, + std::vector<base::string16>(), std::string(), &cancelable_consumer_, Bind(&CallbackHelper::OnQueryResult, callback.get())); base::MessageLoop::current()->Run(); ASSERT_TRUE(callback->success()); diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index 6139966..143d4f4 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -331,21 +331,23 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, scoped_refptr<QueryRequest> request, const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order); - void UpdateHistoryAndBookmarks(scoped_refptr<UpdateRequest> request, - const HistoryAndBookmarkRow& row, - const std::string& selection, - const std::vector<string16>& selection_args); + void UpdateHistoryAndBookmarks( + scoped_refptr<UpdateRequest> request, + const HistoryAndBookmarkRow& row, + const std::string& selection, + const std::vector<base::string16>& selection_args); - void DeleteHistoryAndBookmarks(scoped_refptr<DeleteRequest> request, - const std::string& selection, - const std::vector<string16>& selection_args); + void DeleteHistoryAndBookmarks( + scoped_refptr<DeleteRequest> request, + const std::string& selection, + const std::vector<base::string16>& selection_args); void DeleteHistory(scoped_refptr<DeleteRequest> request, const std::string& selection, - const std::vector<string16>& selection_args); + const std::vector<base::string16>& selection_args); // Statement ---------------------------------------------------------------- // Move the statement's current position. @@ -364,16 +366,16 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, void UpdateSearchTerms(scoped_refptr<UpdateRequest> request, const SearchRow& row, const std::string& selection, - const std::vector<string16> selection_args); + const std::vector<base::string16> selection_args); void DeleteSearchTerms(scoped_refptr<DeleteRequest> request, const std::string& selection, - const std::vector<string16> selection_args); + const std::vector<base::string16> selection_args); void QuerySearchTerms(scoped_refptr<QueryRequest> request, const std::vector<SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order); #endif // defined(OS_ANDROID) diff --git a/chrome/browser/history/history_backend_android.cc b/chrome/browser/history/history_backend_android.cc index 0e823a1..41507742 100644 --- a/chrome/browser/history/history_backend_android.cc +++ b/chrome/browser/history/history_backend_android.cc @@ -25,7 +25,7 @@ void HistoryBackend::QueryHistoryAndBookmarks( scoped_refptr<QueryRequest> request, const std::vector<HistoryAndBookmarkRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order) { if (request->canceled()) return; @@ -42,7 +42,7 @@ void HistoryBackend::UpdateHistoryAndBookmarks( scoped_refptr<UpdateRequest> request, const HistoryAndBookmarkRow& row, const std::string& selection, - const std::vector<string16>& selection_args) { + const std::vector<base::string16>& selection_args) { if (request->canceled()) return; @@ -59,7 +59,7 @@ void HistoryBackend::UpdateHistoryAndBookmarks( void HistoryBackend::DeleteHistoryAndBookmarks( scoped_refptr<DeleteRequest> request, const std::string& selection, - const std::vector<string16>& selection_args) { + const std::vector<base::string16>& selection_args) { if (request->canceled()) return; @@ -75,7 +75,7 @@ void HistoryBackend::DeleteHistoryAndBookmarks( void HistoryBackend::DeleteHistory( scoped_refptr<DeleteRequest> request, const std::string& selection, - const std::vector<string16>& selection_args) { + const std::vector<base::string16>& selection_args) { if (request->canceled()) return; @@ -133,7 +133,7 @@ void HistoryBackend::UpdateSearchTerms( scoped_refptr<UpdateRequest> request, const SearchRow& row, const std::string& selection, - const std::vector<string16> selection_args) { + const std::vector<base::string16> selection_args) { if (request->canceled()) return; @@ -149,7 +149,7 @@ void HistoryBackend::UpdateSearchTerms( void HistoryBackend::DeleteSearchTerms( scoped_refptr<DeleteRequest> request, const std::string& selection, - const std::vector<string16> selection_args) { + const std::vector<base::string16> selection_args) { if (request->canceled()) return; @@ -167,7 +167,7 @@ void HistoryBackend::QuerySearchTerms( scoped_refptr<QueryRequest> request, const std::vector<SearchRow::ColumnID>& projections, const std::string& selection, - const std::vector<string16>& selection_args, + const std::vector<base::string16>& selection_args, const std::string& sort_order) { if (request->canceled()) return; diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc index f61de1a..1057c1c 100644 --- a/chrome/browser/history/query_parser.cc +++ b/chrome/browser/history/query_parser.cc @@ -91,7 +91,7 @@ class QueryNodeWord : public QueryNode { Snippet::MatchPositions* match_positions) const OVERRIDE; virtual bool HasMatchIn( const std::vector<QueryWord>& words) const OVERRIDE; - virtual void AppendWords(std::vector<string16>* words) const OVERRIDE; + virtual void AppendWords(std::vector<base::string16>* words) const OVERRIDE; private: base::string16 word_; @@ -352,7 +352,7 @@ int QueryParser::ParseQuery(const base::string16& query, } void QueryParser::ParseQueryWords(const base::string16& query, - std::vector<string16>* words) { + std::vector<base::string16>* words) { QueryNodeList root; if (!ParseQueryImpl(query, &root)) return; diff --git a/chrome/browser/history/query_parser.h b/chrome/browser/history/query_parser.h index 02f40f6..69d31db 100644 --- a/chrome/browser/history/query_parser.h +++ b/chrome/browser/history/query_parser.h @@ -77,7 +77,7 @@ class QueryParser { // "foo bar" results in two entries being added to words, one for foo and one // for bar. void ParseQueryWords(const base::string16& query, - std::vector<string16>* words); + std::vector<base::string16>* words); // Parses |query|, returning the nodes that constitute the valid words in the // query. This is intended for later usage with DoesQueryMatch. Ownership of diff --git a/chrome/browser/history/query_parser_unittest.cc b/chrome/browser/history/query_parser_unittest.cc index ebc91e4..fe4a505 100644 --- a/chrome/browser/history/query_parser_unittest.cc +++ b/chrome/browser/history/query_parser_unittest.cc @@ -152,7 +152,7 @@ TEST_F(QueryParserTest, ParseQueryWords) { { "\"foo bar\" a", "foo", "bar", "a", 3 }, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { - std::vector<string16> results; + std::vector<base::string16> results; QueryParser parser; parser.ParseQueryWords(UTF8ToUTF16(data[i].text), &results); ASSERT_EQ(data[i].word_count, results.size()); diff --git a/chrome/browser/history/shortcuts_backend.h b/chrome/browser/history/shortcuts_backend.h index a9c2e63..22971aa 100644 --- a/chrome/browser/history/shortcuts_backend.h +++ b/chrome/browser/history/shortcuts_backend.h @@ -82,7 +82,7 @@ class ShortcutsBackend : public RefcountedBrowserContextKeyedService, int number_of_hits; // How many times shortcut was selected. }; - typedef std::multimap<string16, const Shortcut> ShortcutMap; + typedef std::multimap<base::string16, const Shortcut> ShortcutMap; // |profile| is necessary for profile notifications only and can be NULL in // unit-tests. For unit testing, set |suppress_db| to true to prevent creation diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index ef9d58c..a1a10b0 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc @@ -116,7 +116,7 @@ const FaviconGroup kIEFaviconGroup[2] = { bool CreateOrderBlob(const base::FilePath& favorites_folder, const base::string16& path, - const std::vector<string16>& entries) { + const std::vector<base::string16>& entries) { if (entries.size() > 255) return false; @@ -512,7 +512,8 @@ IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) { }; ASSERT_TRUE(CreateOrderBlob( base::FilePath(path), L"", - std::vector<string16>(root_links, root_links + arraysize(root_links)))); + std::vector<base::string16>(root_links, + root_links + arraysize(root_links)))); HRESULT res; diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index a3d5cab..1bf9dc9 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -38,7 +38,7 @@ namespace { base::string16 GenerateUniqueFolderName(BookmarkModel* model, const base::string16& folder_name) { // Build a set containing the bookmark bar folder names. - std::set<string16> existing_folder_names; + std::set<base::string16> existing_folder_names; const BookmarkNode* bookmark_bar = model->bookmark_bar_node(); for (int i = 0; i < bookmark_bar->child_count(); ++i) { const BookmarkNode* node = bookmark_bar->GetChild(i); @@ -173,7 +173,7 @@ void ProfileWriter::AddBookmarks( // Ensure any enclosing folders are present in the model. The bookmark's // enclosing folder structure should be // path[0] > path[1] > ... > path[size() - 1] - for (std::vector<string16>::const_iterator folder_name = + for (std::vector<base::string16>::const_iterator folder_name = bookmark->path.begin(); folder_name != bookmark->path.end(); ++folder_name) { if (bookmark->in_toolbar && parent == bookmark_bar && diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc index 4455c30..4d60b26 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.cc +++ b/chrome/browser/managed_mode/managed_mode_site_list.cc @@ -147,7 +147,8 @@ ManagedModeSiteList* ManagedModeSiteList::Clone() { } // static -void ManagedModeSiteList::GetCategoryNames(std::vector<string16>* categories) { +void ManagedModeSiteList::GetCategoryNames( + std::vector<base::string16>* categories) { // TODO(bauerb): Collect custom categories from extensions. for (size_t i = 0; i < arraysize(g_categories); ++i) { categories->push_back(ASCIIToUTF16(g_categories[i].name)); diff --git a/chrome/browser/managed_mode/managed_mode_site_list.h b/chrome/browser/managed_mode/managed_mode_site_list.h index 545cb1e..7a6c035 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.h +++ b/chrome/browser/managed_mode/managed_mode_site_list.h @@ -63,7 +63,7 @@ class ManagedModeSiteList { // Returns a list of all categories. // TODO(bauerb): The list is hardcoded for now, but if we allow custom // categories, this should live in some registry. - static void GetCategoryNames(std::vector<string16>* categories); + static void GetCategoryNames(std::vector<base::string16>* categories); // Returns a list of all sites in this site list. void GetSites(std::vector<Site>* sites); diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h index c54aaf4..b6bdc4a 100644 --- a/chrome/browser/managed_mode/managed_user_service.h +++ b/chrome/browser/managed_mode/managed_user_service.h @@ -43,7 +43,7 @@ class ManagedUserService : public BrowserContextKeyedService, public content::NotificationObserver, public chrome::BrowserListObserver { public: - typedef std::vector<string16> CategoryList; + typedef std::vector<base::string16> CategoryList; typedef base::Callback<void(content::WebContents*)> NavigationBlockedCallback; typedef base::Callback<void(const GoogleServiceAuthError&)> AuthErrorCallback; diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index 84e49d0..2b4775a 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc @@ -80,7 +80,7 @@ base::string16 GetFileObjectIdFromPathOnBlockingPoolThread( file_path, &relative_path)) return base::string16(); - std::vector<string16> path_components; + std::vector<base::string16> path_components; relative_path.GetComponents(&path_components); DCHECK(!path_components.empty()); base::string16 parent_id(device_info.storage_object_id); diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index a77db51..b985564 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -152,7 +152,7 @@ std::string MemoryDetails::ToLogString() { iter1->process_type, iter1->renderer_type); if (!iter1->titles.empty()) { log += " ["; - for (std::vector<string16>::const_iterator iter2 = + for (std::vector<base::string16>::const_iterator iter2 = iter1->titles.begin(); iter2 != iter1->titles.end(); ++iter2) { if (iter2 != iter1->titles.begin()) diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h index 8756acd..07984b5 100644 --- a/chrome/browser/memory_details.h +++ b/chrome/browser/memory_details.h @@ -62,7 +62,7 @@ struct ProcessMemoryInformation { // If this is a renderer process, what type it is. RendererProcessType renderer_type; // A collection of titles used, i.e. for a tab it'll show all the page titles. - std::vector<string16> titles; + std::vector<base::string16> titles; }; typedef std::vector<ProcessMemoryInformation> ProcessMemoryInformationList; diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index bffc614..98543eb 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -1860,7 +1860,7 @@ void MetricsService::RecordPluginChanges(PrefService* pref) { // Now go through and add dictionaries for plugins that didn't already have // reports in Local State. - for (std::map<string16, ChildProcessStats>::iterator cache_iter = + for (std::map<base::string16, ChildProcessStats>::iterator cache_iter = child_process_stats_buffer_.begin(); cache_iter != child_process_stats_buffer_.end(); ++cache_iter) { ChildProcessStats stats = cache_iter->second; diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h index 0e9e054..bb6798e 100644 --- a/chrome/browser/metrics/metrics_service.h +++ b/chrome/browser/metrics/metrics_service.h @@ -520,7 +520,7 @@ class MetricsService int next_window_id_; // Buffer of child process notifications for quick access. - std::map<string16, ChildProcessStats> child_process_stats_buffer_; + std::map<base::string16, ChildProcessStats> child_process_stats_buffer_; // Weak pointers factory used to post task on different threads. All weak // pointers managed by this factory have the same lifetime as MetricsService. diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 883052d..4d35d2c 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -325,7 +325,7 @@ void MessageCenterSettingsController::SetNotifierEnabled( << notifier.notifier_id.url.spec(); } } else { - std::map<string16, ContentSettingsPattern>::const_iterator iter = + std::map<base::string16, ContentSettingsPattern>::const_iterator iter = patterns_.find(notifier.name); if (iter != patterns_.end()) { notification_service->ClearSetting(iter->second); diff --git a/chrome/browser/notifications/message_center_settings_controller.h b/chrome/browser/notifications/message_center_settings_controller.h index 0008017..7bf75c6 100644 --- a/chrome/browser/notifications/message_center_settings_controller.h +++ b/chrome/browser/notifications/message_center_settings_controller.h @@ -103,7 +103,7 @@ class MessageCenterSettingsController scoped_ptr<extensions::AppIconLoader> app_icon_loader_; - std::map<string16, ContentSettingsPattern> patterns_; + std::map<base::string16, ContentSettingsPattern> patterns_; // The list of all configurable notifier groups. This is each profile that is // loaded (and in the ProfileInfoCache - so no incognito profiles go here). diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc index 14f0d83..d55ec2d 100644 --- a/chrome/browser/password_manager/login_database.cc +++ b/chrome/browser/password_manager/login_database.cc @@ -553,7 +553,8 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { return Init(db_path_); } -Pickle LoginDatabase::SerializeVector(const std::vector<string16>& vec) const { +Pickle LoginDatabase::SerializeVector( + const std::vector<base::string16>& vec) const { Pickle p; for (size_t i = 0; i < vec.size(); ++i) { p.WriteString16(vec[i]); @@ -561,8 +562,9 @@ Pickle LoginDatabase::SerializeVector(const std::vector<string16>& vec) const { return p; } -std::vector<string16> LoginDatabase::DeserializeVector(const Pickle& p) const { - std::vector<string16> ret; +std::vector<base::string16> LoginDatabase::DeserializeVector( + const Pickle& p) const { + std::vector<base::string16> ret; base::string16 str; PickleIterator iterator(p); diff --git a/chrome/browser/password_manager/login_database.h b/chrome/browser/password_manager/login_database.h index 1b3c46b..d7bd738 100644 --- a/chrome/browser/password_manager/login_database.h +++ b/chrome/browser/password_manager/login_database.h @@ -127,8 +127,8 @@ class LoginDatabase { bool blacklisted, std::vector<autofill::PasswordForm*>* forms) const; // Serialization routines for vectors. - Pickle SerializeVector(const std::vector<string16>& vec) const; - std::vector<string16> DeserializeVector(const Pickle& pickle) const; + Pickle SerializeVector(const std::vector<base::string16>& vec) const; + std::vector<base::string16> DeserializeVector(const Pickle& pickle) const; base::FilePath db_path_; mutable sql::Connection db_; diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc index 94cf3b6..893b330 100644 --- a/chrome/browser/password_manager/login_database_unittest.cc +++ b/chrome/browser/password_manager/login_database_unittest.cc @@ -30,11 +30,11 @@ class LoginDatabaseTest : public testing::Test { ASSERT_TRUE(db_.Init(file_)); } - Pickle SerializeVector(const std::vector<string16>& vec) const { + Pickle SerializeVector(const std::vector<base::string16>& vec) const { return db_.SerializeVector(vec); } - std::vector<string16> DeserializeVector(const Pickle& pickle) const { + std::vector<base::string16> DeserializeVector(const Pickle& pickle) const { return db_.DeserializeVector(pickle); } @@ -612,9 +612,9 @@ TEST_F(LoginDatabaseTest, BlacklistedLogins) { TEST_F(LoginDatabaseTest, VectorSerialization) { // Empty vector. - std::vector<string16> vec; + std::vector<base::string16> vec; Pickle temp = SerializeVector(vec); - std::vector<string16> output = DeserializeVector(temp); + std::vector<base::string16> output = DeserializeVector(temp); EXPECT_THAT(output, Eq(vec)); // Normal data. diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc index b41669b..f129ae7 100644 --- a/chrome/browser/password_manager/password_form_manager.cc +++ b/chrome/browser/password_manager/password_form_manager.cc @@ -452,15 +452,15 @@ void PasswordFormManager::SanitizePossibleUsernames(PasswordForm* form) { // Remove any possible usernames that could be credit cards or SSN for privacy // reasons. Also remove duplicates, both in other_possible_usernames and // between other_possible_usernames and username_value. - std::set<string16> set; - for (std::vector<string16>::iterator it = + std::set<base::string16> set; + for (std::vector<base::string16>::iterator it = form->other_possible_usernames.begin(); it != form->other_possible_usernames.end(); ++it) { if (!autofill::IsValidCreditCardNumber(*it) && !autofill::IsSSN(*it)) set.insert(*it); } set.erase(form->username_value); - std::vector<string16> temp(set.begin(), set.end()); + std::vector<base::string16> temp(set.begin(), set.end()); form->other_possible_usernames.swap(temp); } diff --git a/chrome/browser/password_manager/password_form_manager_unittest.cc b/chrome/browser/password_manager/password_form_manager_unittest.cc index d80f7be..dd9f3f0 100644 --- a/chrome/browser/password_manager/password_form_manager_unittest.cc +++ b/chrome/browser/password_manager/password_form_manager_unittest.cc @@ -572,7 +572,7 @@ TEST_F(PasswordFormManagerTest, TestSanitizePossibleUsernames) { SanitizePossibleUsernames(manager.get(), &credentials); // Possible credit card number and SSN are stripped. - std::vector<string16> expected; + std::vector<base::string16> expected; expected.push_back(ASCIIToUTF16("other username")); EXPECT_THAT(credentials.other_possible_usernames, Eq(expected)); diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index ebaf5a7..d3b3451 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -104,14 +104,14 @@ class PluginPrefs : public RefcountedBrowserContextKeyedService { // Called to update one of the policy_xyz patterns below when a // preference changes. - void UpdatePatternsAndNotify(std::set<string16>* patterns, + void UpdatePatternsAndNotify(std::set<base::string16>* patterns, const std::string& pref_name); // Allows unit tests to directly set enforced plug-in patterns. void SetPolicyEnforcedPluginPatterns( - const std::set<string16>& disabled_patterns, - const std::set<string16>& disabled_exception_patterns, - const std::set<string16>& enabled_patterns); + const std::set<base::string16>& disabled_patterns, + const std::set<base::string16>& disabled_exception_patterns, + const std::set<base::string16>& enabled_patterns); // Callback for after the plugin groups have been loaded. void EnablePluginGroupInternal( @@ -132,21 +132,21 @@ class PluginPrefs : public RefcountedBrowserContextKeyedService { void NotifyPluginStatusChanged(); static void ListValueToStringSet(const base::ListValue* src, - std::set<string16>* dest); + std::set<base::string16>* dest); // Checks if |name| matches any of the patterns in |pattern_set|. static bool IsStringMatchedInSet(const base::string16& name, - const std::set<string16>& pattern_set); + const std::set<base::string16>& pattern_set); // Guards access to the following data structures. mutable base::Lock lock_; PluginState plugin_state_; - std::map<string16, bool> plugin_group_state_; + std::map<base::string16, bool> plugin_group_state_; - std::set<string16> policy_disabled_plugin_patterns_; - std::set<string16> policy_disabled_plugin_exception_patterns_; - std::set<string16> policy_enabled_plugin_patterns_; + std::set<base::string16> policy_disabled_plugin_patterns_; + std::set<base::string16> policy_disabled_plugin_exception_patterns_; + std::set<base::string16> policy_enabled_plugin_patterns_; // Weak pointer, owns us. Only used as a notification source. Profile* profile_; diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc index 12e1a11..546c08f2 100644 --- a/chrome/browser/plugins/plugin_prefs_unittest.cc +++ b/chrome/browser/plugins/plugin_prefs_unittest.cc @@ -63,9 +63,9 @@ class PluginPrefsTest : public ::testing::Test { } void SetPolicyEnforcedPluginPatterns( - const std::set<string16>& disabled, - const std::set<string16>& disabled_exceptions, - const std::set<string16>& enabled) { + const std::set<base::string16>& disabled, + const std::set<base::string16>& disabled_exceptions, + const std::set<base::string16>& enabled) { plugin_prefs_->SetPolicyEnforcedPluginPatterns( disabled, disabled_exceptions, enabled); } @@ -102,12 +102,12 @@ class PluginPrefsTest : public ::testing::Test { }; TEST_F(PluginPrefsTest, DisabledByPolicy) { - std::set<string16> disabled_plugins; + std::set<base::string16> disabled_plugins; disabled_plugins.insert(ASCIIToUTF16("Disable this!")); disabled_plugins.insert(ASCIIToUTF16("*Google*")); SetPolicyEnforcedPluginPatterns(disabled_plugins, - std::set<string16>(), - std::set<string16>()); + std::set<base::string16>(), + std::set<base::string16>()); EXPECT_EQ(PluginPrefs::NO_POLICY, plugin_prefs_->PolicyStatusForPlugin(ASCIIToUTF16("42"))); @@ -119,11 +119,11 @@ TEST_F(PluginPrefsTest, DisabledByPolicy) { } TEST_F(PluginPrefsTest, EnabledByPolicy) { - std::set<string16> enabled_plugins; + std::set<base::string16> enabled_plugins; enabled_plugins.insert(ASCIIToUTF16("Enable that!")); enabled_plugins.insert(ASCIIToUTF16("PDF*")); - SetPolicyEnforcedPluginPatterns(std::set<string16>(), - std::set<string16>(), + SetPolicyEnforcedPluginPatterns(std::set<base::string16>(), + std::set<base::string16>(), enabled_plugins); EXPECT_EQ(PluginPrefs::NO_POLICY, @@ -144,9 +144,9 @@ TEST_F(PluginPrefsTest, EnabledAndDisabledByPolicy) { const base::string16 kGoogleMars(ASCIIToUTF16("Google Mars")); const base::string16 kGoogleEarth(ASCIIToUTF16("Google Earth")); - std::set<string16> disabled_plugins; - std::set<string16> disabled_plugins_exceptions; - std::set<string16> enabled_plugins; + std::set<base::string16> disabled_plugins; + std::set<base::string16> disabled_plugins_exceptions; + std::set<base::string16> enabled_plugins; disabled_plugins.insert(kEnabled); disabled_plugins_exceptions.insert(kEnabled); @@ -253,11 +253,11 @@ TEST_F(PluginPrefsTest, UnifiedPepperFlashState) { EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2)); EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin)); - std::set<string16> disabled_plugins; + std::set<base::string16> disabled_plugins; disabled_plugins.insert(component_updated_plugin_name); SetPolicyEnforcedPluginPatterns(disabled_plugins, - std::set<string16>(), - std::set<string16>()); + std::set<base::string16>(), + std::set<base::string16>()); // Policy settings should be respected. EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1)); diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h index e73287c..cc61e04 100644 --- a/chrome/browser/profiles/profile_info_cache.h +++ b/chrome/browser/profiles/profile_info_cache.h @@ -145,7 +145,7 @@ class ProfileInfoCache : public ProfileInfoInterface, // Because this method will be called during uninstall, before the creation // of the ProfileManager, it reads directly from the local state preferences, // rather than going through the ProfileInfoCache object. - static std::vector<string16> GetProfileNames(); + static std::vector<base::string16> GetProfileNames(); // Register cache related preferences in Local State. static void RegisterPrefs(PrefRegistrySimple* registry); diff --git a/chrome/browser/profiles/profile_info_cache_unittest.cc b/chrome/browser/profiles/profile_info_cache_unittest.cc index 699ba14..61f218d 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.cc +++ b/chrome/browser/profiles/profile_info_cache_unittest.cc @@ -500,7 +500,7 @@ TEST_F(ProfileInfoCacheTest, AddStubProfile) { ASSERT_EQ(4U, GetCache()->GetNumberOfProfiles()); // Check that the profiles can be extracted from the local state. - std::vector<string16> names = ProfileInfoCache::GetProfileNames(); + std::vector<base::string16> names = ProfileInfoCache::GetProfileNames(); for (size_t i = 0; i < 4; i++) ASSERT_FALSE(names[i].empty()); } diff --git a/chrome/browser/profiles/profile_info_cache_unittest.h b/chrome/browser/profiles/profile_info_cache_unittest.h index 778ac3e..1f5ba8a 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.h +++ b/chrome/browser/profiles/profile_info_cache_unittest.h @@ -40,7 +40,7 @@ class ProfileNameVerifierObserver : public ProfileInfoCacheObserver { private: ProfileInfoCache* GetCache(); - std::set<string16> profile_names_; + std::set<base::string16> profile_names_; TestingProfileManager* testing_profile_manager_; DISALLOW_COPY_AND_ASSIGN(ProfileNameVerifierObserver); }; diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index 52fef02..8ecbd84 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -80,10 +80,10 @@ std::string ReadDataFromPickle(const base::string16& format, return result; } -bool WriteDataToPickle(const std::map<string16, std::string>& data, +bool WriteDataToPickle(const std::map<base::string16, std::string>& data, Pickle* pickle) { pickle->WriteUInt64(data.size()); - for (std::map<string16, std::string>::const_iterator it = data.begin(); + for (std::map<base::string16, std::string>::const_iterator it = data.begin(); it != data.end(); ++it) { if (!pickle->WriteString16(it->first)) return false; @@ -304,7 +304,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData( } ui::ScopedClipboardWriter scw(clipboard, type); - std::map<string16, std::string> custom_data_map; + std::map<base::string16, std::string> custom_data_map; int32_t res = PP_OK; for (uint32_t i = 0; i < formats.size(); ++i) { if (data[i].length() > kMaxClipboardWriteSize) { diff --git a/chrome/browser/search_engines/search_terms_data_android.cc b/chrome/browser/search_engines/search_terms_data_android.cc index 229064a..916014a 100644 --- a/chrome/browser/search_engines/search_terms_data_android.cc +++ b/chrome/browser/search_engines/search_terms_data_android.cc @@ -7,7 +7,7 @@ #include "chrome/browser/search_engines/search_terms_data.h" #include "content/public/browser/browser_thread.h" -base::LazyInstance<string16>::Leaky +base::LazyInstance<base::string16>::Leaky SearchTermsDataAndroid::rlz_parameter_value_ = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<std::string>::Leaky SearchTermsDataAndroid::search_client_ = LAZY_INSTANCE_INITIALIZER; diff --git a/chrome/browser/search_engines/search_terms_data_android.h b/chrome/browser/search_engines/search_terms_data_android.h index a104780..91a9924 100644 --- a/chrome/browser/search_engines/search_terms_data_android.h +++ b/chrome/browser/search_engines/search_terms_data_android.h @@ -12,7 +12,7 @@ // Additional data needed by TemplateURLRef::ReplaceSearchTerms on Android. struct SearchTermsDataAndroid { - static base::LazyInstance<string16>::Leaky rlz_parameter_value_; + static base::LazyInstance<base::string16>::Leaky rlz_parameter_value_; static base::LazyInstance<std::string>::Leaky search_client_; }; diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index bc5d318..a2d2d6d 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -800,7 +800,7 @@ std::string TemplateURLRef::HandleReplacements( if (i->type == SEARCH_TERMS) { base::string16::size_type query_start = parsed_url_.find('?'); is_in_query = query_start != base::string16::npos && - (static_cast<string16::size_type>(i->index) > query_start); + (static_cast<base::string16::size_type>(i->index) > query_start); break; } } diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index 8748163..3a77111 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -404,7 +404,7 @@ class TemplateURLService : public WebDataServiceConsumer, friend class TemplateURLServiceTestUtilBase; - typedef std::map<string16, TemplateURL*> KeywordToTemplateMap; + typedef std::map<base::string16, TemplateURL*> KeywordToTemplateMap; typedef std::map<std::string, TemplateURL*> GUIDToTemplateMap; // Declaration of values to be used in an enumerated histogram to tally diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index e078123..3772dfb 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -335,7 +335,7 @@ bool ShellIntegration::IsFirefoxDefaultBrowser() { base::string16 ShellIntegration::GetAppModelIdForProfile( const base::string16& app_name, const base::FilePath& profile_path) { - std::vector<string16> components; + std::vector<base::string16> components; components.push_back(app_name); const base::string16 profile_id(GetProfileIdFromPath(profile_path)); if (!profile_id.empty()) diff --git a/chrome/browser/signin/signin_global_error.cc b/chrome/browser/signin/signin_global_error.cc index 86c9589..87d7e29 100644 --- a/chrome/browser/signin/signin_global_error.cc +++ b/chrome/browser/signin/signin_global_error.cc @@ -143,8 +143,8 @@ base::string16 SigninGlobalError::GetBubbleViewTitle() { return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE); } -std::vector<string16> SigninGlobalError::GetBubbleViewMessages() { - std::vector<string16> messages; +std::vector<base::string16> SigninGlobalError::GetBubbleViewMessages() { + std::vector<base::string16> messages; // If the user isn't signed in, no need to display an error bubble. SigninManagerBase* signin_manager = diff --git a/chrome/browser/signin/signin_global_error.h b/chrome/browser/signin/signin_global_error.h index 8c9557c..b68b1be 100644 --- a/chrome/browser/signin/signin_global_error.h +++ b/chrome/browser/signin/signin_global_error.h @@ -58,7 +58,7 @@ class SigninGlobalError : public GlobalErrorWithStandardBubble { virtual void ExecuteMenuItem(Browser* browser) OVERRIDE; virtual bool HasBubbleView() OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; diff --git a/chrome/browser/signin/signin_names_io_thread.h b/chrome/browser/signin/signin_names_io_thread.h index 8a64bc6..20902ba 100644 --- a/chrome/browser/signin/signin_names_io_thread.h +++ b/chrome/browser/signin/signin_names_io_thread.h @@ -31,7 +31,7 @@ class NotificationSource; // ProfileIOData. class SigninNamesOnIOThread : public content::NotificationObserver { public: - typedef std::set<string16> EmailSet; + typedef std::set<base::string16> EmailSet; // Objects should only be created on UI thread. SigninNamesOnIOThread(); diff --git a/chrome/browser/spellchecker/feedback.h b/chrome/browser/spellchecker/feedback.h index 124bf04..cbf1f20 100644 --- a/chrome/browser/spellchecker/feedback.h +++ b/chrome/browser/spellchecker/feedback.h @@ -23,7 +23,7 @@ namespace spellcheck { // Stores user feedback to spellcheck suggestions. Sample usage: // Feedback feedback; // feedback.AddMisspelling(renderer_process_id, Misspelling( -// ASCIIToUTF16("Helllo world"), 0, 6, std::vector<string16>(), +// ASCIIToUTF16("Helllo world"), 0, 6, std::vector<base::string16>(), // GenerateRandomHash())); // feedback.FinalizeRemovedMisspellings(renderer_process_id, // std::vector<uint32>()); @@ -88,7 +88,7 @@ class Feedback { typedef std::map<uint32, Misspelling> HashMisspellingMap; typedef std::set<uint32> HashCollection; typedef std::map<int, HashCollection> RendererHashesMap; - typedef std::map<string16, HashCollection> TextHashesMap; + typedef std::map<base::string16, HashCollection> TextHashesMap; // An empty hash collection to return when FindMisspellings() does not find // misspellings. diff --git a/chrome/browser/spellchecker/feedback_sender.cc b/chrome/browser/spellchecker/feedback_sender.cc index 6f837b1..af7677e 100644 --- a/chrome/browser/spellchecker/feedback_sender.cc +++ b/chrome/browser/spellchecker/feedback_sender.cc @@ -83,7 +83,7 @@ Misspelling BuildFeedback(const SpellCheckResult& result, return Misspelling(context, start, result.length, - std::vector<string16>(1, result.replacement), + std::vector<base::string16>(1, result.replacement), result.hash); } diff --git a/chrome/browser/spellchecker/misspelling.cc b/chrome/browser/spellchecker/misspelling.cc index bcf9904..e92a6f4 100644 --- a/chrome/browser/spellchecker/misspelling.cc +++ b/chrome/browser/spellchecker/misspelling.cc @@ -16,7 +16,7 @@ namespace { // Builds a value from a list of spellcheck suggestions. The caller owns the // result. -base::Value* BuildSuggestionsValue(const std::vector<string16>& list) { +base::Value* BuildSuggestionsValue(const std::vector<base::string16>& list) { base::ListValue* result = new base::ListValue; result->AppendStrings(list); return result; @@ -38,7 +38,7 @@ Misspelling::Misspelling() Misspelling::Misspelling(const base::string16& context, size_t location, size_t length, - const std::vector<string16>& suggestions, + const std::vector<base::string16>& suggestions, uint32 hash) : context(context), location(location), diff --git a/chrome/browser/spellchecker/misspelling.h b/chrome/browser/spellchecker/misspelling.h index 9da7f20..6fe98dd8 100644 --- a/chrome/browser/spellchecker/misspelling.h +++ b/chrome/browser/spellchecker/misspelling.h @@ -22,7 +22,8 @@ // misspelling.context = ASCIIToUTF16("Helllo world"); // misspelling.location = 0; // misspelling.length = 6; -// misspelling.suggestions = std::vector<string16>(1, ASCIIToUTF16("Hello")); +// misspelling.suggestions = +// std::vector<base::string16>(1, ASCIIToUTF16("Hello")); // misspelling.hash = GenerateRandomHash(); // misspelling.action.type = SpellcheckAction::TYPE_SELECT; // misspelling.action.index = 0; @@ -33,7 +34,7 @@ class Misspelling { Misspelling(const base::string16& context, size_t location, size_t length, - const std::vector<string16>& suggestions, + const std::vector<base::string16>& suggestions, uint32 hash); ~Misspelling(); @@ -56,7 +57,7 @@ class Misspelling { size_t length; // Spelling suggestions. - std::vector<string16> suggestions; + std::vector<base::string16> suggestions; // The hash that identifies the misspelling. uint32 hash; diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc b/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc index 0b5adc7..be319c7 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc @@ -253,7 +253,7 @@ void SpellCheckMessageFilterMac::OnCheckSpelling(const base::string16& word, void SpellCheckMessageFilterMac::OnFillSuggestionList( const base::string16& word, - std::vector<string16>* suggestions) { + std::vector<base::string16>* suggestions) { spellcheck_mac::FillSuggestionList(word, suggestions); } diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h b/chrome/browser/spellchecker/spellcheck_message_filter_mac.h index 8321761..944a1f0 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac.h @@ -39,7 +39,7 @@ class SpellCheckMessageFilterMac : public content::BrowserMessageFilter { void OnCheckSpelling(const base::string16& word, int route_id, bool* correct); void OnFillSuggestionList(const base::string16& word, - std::vector<string16>* suggestions); + std::vector<base::string16>* suggestions); void OnShowSpellingPanel(bool show); void OnUpdateSpellingPanelWithMisspelledWord(const base::string16& word); void OnRequestTextCheck(int route_id, diff --git a/chrome/browser/spellchecker/spellcheck_platform_mac.h b/chrome/browser/spellchecker/spellcheck_platform_mac.h index 02398dc..1ddc5f6 100644 --- a/chrome/browser/spellchecker/spellcheck_platform_mac.h +++ b/chrome/browser/spellchecker/spellcheck_platform_mac.h @@ -64,7 +64,7 @@ bool CheckSpelling(const base::string16& word_to_check, int tag); // kMaxSuggestions, which is defined in spellchecker_common.h) of suggestions // for the string |wrong_word|. void FillSuggestionList(const base::string16& wrong_word, - std::vector<string16>* optional_suggestions); + std::vector<base::string16>* optional_suggestions); // Adds the given word to the platform dictionary. void AddWord(const base::string16& word); diff --git a/chrome/browser/spellchecker/spellcheck_platform_mac.mm b/chrome/browser/spellchecker/spellcheck_platform_mac.mm index 265cf43..a5951ed 100644 --- a/chrome/browser/spellchecker/spellcheck_platform_mac.mm +++ b/chrome/browser/spellchecker/spellcheck_platform_mac.mm @@ -195,7 +195,7 @@ bool CheckSpelling(const base::string16& word_to_check, int tag) { } void FillSuggestionList(const base::string16& wrong_word, - std::vector<string16>* optional_suggestions) { + std::vector<base::string16>* optional_suggestions) { NSString* NS_wrong_word = base::SysUTF16ToNSString(wrong_word); TimeTicks debug_begin_time = base::Histogram::DebugNow(); // The suggested words for |wrong_word|. diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 4ca2a48..4d3ab75 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -417,7 +417,7 @@ void SSLBlockingPage::NotifyAllowCertificate() { // static void SSLBlockingPage::SetExtraInfo( DictionaryValue* strings, - const std::vector<string16>& extra_info) { + const std::vector<base::string16>& extra_info) { DCHECK_LT(extra_info.size(), 5U); // We allow 5 paragraphs max. const char* keys[5] = { "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h index e396354..46dc6a8 100644 --- a/chrome/browser/ssl/ssl_blocking_page.h +++ b/chrome/browser/ssl/ssl_blocking_page.h @@ -45,7 +45,7 @@ class SSLBlockingPage : public content::InterstitialPageDelegate { // ssl_error.html files. // Note: there can be up to 5 strings in |extra_info|. static void SetExtraInfo(base::DictionaryValue* strings, - const std::vector<string16>& extra_info); + const std::vector<base::string16>& extra_info); protected: // InterstitialPageDelegate implementation. diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index 571d67f..3e1d10e 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -19,7 +19,7 @@ SSLErrorInfo::SSLErrorInfo(const base::string16& title, const base::string16& details, const base::string16& short_description, - const std::vector<string16>& extra_info) + const std::vector<base::string16>& extra_info) : title_(title), details_(details), short_description_(short_description), @@ -31,7 +31,7 @@ SSLErrorInfo SSLErrorInfo::CreateError(ErrorType error_type, net::X509Certificate* cert, const GURL& request_url) { base::string16 title, details, short_description; - std::vector<string16> extra_info; + std::vector<base::string16> extra_info; switch (error_type) { case CERT_COMMON_NAME_INVALID: { title = diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h index 0915833..a4020a7 100644 --- a/chrome/browser/ssl/ssl_error_info.h +++ b/chrome/browser/ssl/ssl_error_info.h @@ -67,7 +67,7 @@ class SSLErrorInfo { // A lengthy explanation of what the error is. Each entry in the returned // vector is a paragraph. - const std::vector<string16>& extra_information() const { + const std::vector<base::string16>& extra_information() const { return extra_information_; } @@ -75,14 +75,14 @@ class SSLErrorInfo { SSLErrorInfo(const base::string16& title, const base::string16& details, const base::string16& short_description, - const std::vector<string16>& extra_info); + const std::vector<base::string16>& extra_info); base::string16 title_; base::string16 details_; base::string16 short_description_; // Extra-informations contains paragraphs of text explaining in details what // the error is and what the risks are. - std::vector<string16> extra_information_; + std::vector<base::string16> extra_information_; }; #endif // CHROME_BROWSER_SSL_SSL_ERROR_INFO_H_ diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.h b/chrome/browser/storage_monitor/portable_device_watcher_win.h index 1d94652..e893d1d 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.h +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.h @@ -29,7 +29,7 @@ class TestPortableDeviceWatcherWin; // tasks it spins off to a SequencedTaskRunner. class PortableDeviceWatcherWin { public: - typedef std::vector<string16> StorageObjectIDs; + typedef std::vector<base::string16> StorageObjectIDs; struct DeviceStorageObject { DeviceStorageObject(const base::string16& temporary_id, @@ -102,7 +102,7 @@ class PortableDeviceWatcherWin { // Key: MTP device plug and play ID string. // Value: Vector of device storage objects. - typedef std::map<string16, StorageObjects> MTPDeviceMap; + typedef std::map<base::string16, StorageObjects> MTPDeviceMap; // Helpers to enumerate existing MTP storage devices. virtual void EnumerateAttachedDevices(); diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc index e4572c4..14efaf8 100644 --- a/chrome/browser/sync/sync_global_error.cc +++ b/chrome/browser/sync/sync_global_error.cc @@ -64,8 +64,8 @@ base::string16 SyncGlobalError::GetBubbleViewTitle() { return l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE); } -std::vector<string16> SyncGlobalError::GetBubbleViewMessages() { - return std::vector<string16>(1, bubble_message_); +std::vector<base::string16> SyncGlobalError::GetBubbleViewMessages() { + return std::vector<base::string16>(1, bubble_message_); } base::string16 SyncGlobalError::GetBubbleViewAcceptButtonLabel() { diff --git a/chrome/browser/sync/sync_global_error.h b/chrome/browser/sync/sync_global_error.h index 8febcbb..5437e0f 100644 --- a/chrome/browser/sync/sync_global_error.h +++ b/chrome/browser/sync/sync_global_error.h @@ -28,7 +28,7 @@ class SyncGlobalError : public GlobalErrorWithStandardBubble, virtual bool HasBubbleView() OVERRIDE; virtual base::string16 GetBubbleViewTitle() OVERRIDE; - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE; + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE; virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE; virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE; virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE; diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index d13b364..dd8faa9 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -323,7 +323,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service, // will return a unique combination of status and link messages from // GetStatusLabels(). TEST_F(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) { - std::set<string16> messages; + std::set<base::string16> messages; for (int idx = 0; idx != NUMBER_OF_STATUS_CASES; idx++) { scoped_ptr<Profile> profile(new TestingProfile()); ProfileSyncServiceMock service(profile.get()); diff --git a/chrome/browser/tab_contents/spelling_menu_observer.cc b/chrome/browser/tab_contents/spelling_menu_observer.cc index 3590720..46f3e14 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.cc +++ b/chrome/browser/tab_contents/spelling_menu_observer.cc @@ -386,7 +386,7 @@ void SpellingMenuObserver::OnTextCheckComplete( result_.replace(it->location, it->length, it->replacement); } base::string16 result = base::i18n::ToLower(result_); - for (std::vector<string16>::const_iterator it = suggestions_.begin(); + for (std::vector<base::string16>::const_iterator it = suggestions_.begin(); it != suggestions_.end(); ++it) { if (result == base::i18n::ToLower(*it)) { succeeded_ = false; diff --git a/chrome/browser/tab_contents/spelling_menu_observer.h b/chrome/browser/tab_contents/spelling_menu_observer.h index 3618579..29af370 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.h +++ b/chrome/browser/tab_contents/spelling_menu_observer.h @@ -70,7 +70,7 @@ class SpellingMenuObserver : public RenderViewContextMenuObserver { // Suggested words from the local spellchecker. If the spelling service // returns a word in this list, we hide the context-menu item to prevent // showing the same word twice. - std::vector<string16> suggestions_; + std::vector<base::string16> suggestions_; // The string used for animation until we receive a response from the Spelling // service. The current animation just adds periods at the end of this string: diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc index 6155e30..c578a50 100644 --- a/chrome/browser/translate/translate_infobar_delegate.cc +++ b/chrome/browser/translate/translate_infobar_delegate.cc @@ -256,7 +256,7 @@ base::string16 TranslateInfoBarDelegate::GetLanguageDisplayableName( // static void TranslateInfoBarDelegate::GetAfterTranslateStrings( - std::vector<string16>* strings, + std::vector<base::string16>* strings, bool* swap_languages, bool autodetermined_source_language) { DCHECK(strings); diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/chrome/browser/translate/translate_infobar_delegate.h index 25f3424..01f0722 100644 --- a/chrome/browser/translate/translate_infobar_delegate.h +++ b/chrome/browser/translate/translate_infobar_delegate.h @@ -168,7 +168,7 @@ class TranslateInfoBarDelegate : public InfoBarDelegate { // should be inverted (some languages express the sentense as "The page has // been translate to <lang2> from <lang1>."). It is ignored if // |autodetermined_source_language| is true. - static void GetAfterTranslateStrings(std::vector<string16>* strings, + static void GetAfterTranslateStrings(std::vector<base::string16>* strings, bool* swap_languages, bool autodetermined_source_language); diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc index 258bf8a..bf73d80 100644 --- a/chrome/browser/ui/android/infobars/translate_infobar.cc +++ b/chrome/browser/ui/android/infobars/translate_infobar.cc @@ -36,7 +36,7 @@ TranslateInfoBar::~TranslateInfoBar() { ScopedJavaLocalRef<jobject> TranslateInfoBar::CreateRenderInfoBar(JNIEnv* env) { java_translate_delegate_.Reset(Java_TranslateInfoBarDelegate_create(env)); TranslateInfoBarDelegate* delegate = GetDelegate(); - std::vector<string16> languages; + std::vector<base::string16> languages; languages.reserve(delegate->num_languages()); for (size_t i = 0; i < delegate->num_languages(); ++i) languages.push_back(delegate->language_name_at(i)); diff --git a/chrome/browser/ui/app_list/search/tokenized_string.h b/chrome/browser/ui/app_list/search/tokenized_string.h index 94d4e53..abc2ec2 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string.h +++ b/chrome/browser/ui/app_list/search/tokenized_string.h @@ -18,7 +18,7 @@ namespace app_list { // the words again at camel case boundaries and alpha/number boundaries. class TokenizedString { public: - typedef std::vector<string16> Tokens; + typedef std::vector<base::string16> Tokens; typedef std::vector<gfx::Range> Mappings; explicit TokenizedString(const base::string16& text); diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index d933dfe..882b653 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -518,7 +518,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, FillInputFromAutofill) { } // Now simulate some user edits and try again. - std::vector<string16> expectations; + std::vector<base::string16> expectations; for (size_t i = 0; i < inputs.size(); ++i) { base::string16 users_input = i % 2 == 0 ? base::string16() : ASCIIToUTF16("dummy"); @@ -574,7 +574,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, } // Now simulate some user edits and try again. - std::vector<string16> expectations; + std::vector<base::string16> expectations; for (size_t i = 0; i < inputs.size(); ++i) { base::string16 users_input = i % 2 == 0 ? base::string16() : ASCIIToUTF16("dummy"); @@ -608,11 +608,11 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AutofillProfile full_profile(test::GetFullProfile()); // Set up some variant data. - std::vector<string16> names; + std::vector<base::string16> names; names.push_back(ASCIIToUTF16("John Doe")); names.push_back(ASCIIToUTF16("Jane Doe")); full_profile.SetRawMultiInfo(NAME_FULL, names); - std::vector<string16> emails; + std::vector<base::string16> emails; emails.push_back(ASCIIToUTF16("user@example.com")); emails.push_back(ASCIIToUTF16("admin@example.com")); full_profile.SetRawMultiInfo(EMAIL_ADDRESS, emails); diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index b4e632c..3f1be57 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -1862,7 +1862,7 @@ void AutofillDialogControllerImpl::UserEditedOrActivatedInput( return; } - std::vector<string16> popup_values, popup_labels, popup_icons; + std::vector<base::string16> popup_values, popup_labels, popup_icons; if (common::IsCreditCardType(type)) { GetManager()->GetCreditCardSuggestions(AutofillType(type), field_contents, diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h index 08ad052..70377c0 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h @@ -449,9 +449,9 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate, ServerFieldType type, const base::string16& field_contents, const DetailInputs& inputs, - std::vector<string16>* popup_values, - std::vector<string16>* popup_labels, - std::vector<string16>* popup_icons); + std::vector<base::string16>* popup_values, + std::vector<base::string16>* popup_labels, + std::vector<base::string16>* popup_icons); // Like RequestedFieldsForSection, but returns a pointer. DetailInputs* MutableRequestedFieldsForSection(DialogSection section); diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc index 0d96352..ef51b7b 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc @@ -948,11 +948,11 @@ TEST_F(AutofillDialogControllerTest, AutofillProfileVariants) { // Set up some variant data. AutofillProfile full_profile(test::GetVerifiedProfile()); - std::vector<string16> names; + std::vector<base::string16> names; names.push_back(ASCIIToUTF16("John Doe")); names.push_back(ASCIIToUTF16("Jane Doe")); full_profile.SetRawMultiInfo(NAME_FULL, names); - std::vector<string16> emails; + std::vector<base::string16> emails; emails.push_back(ASCIIToUTF16(kFakeEmail)); emails.push_back(ASCIIToUTF16("admin@example.com")); full_profile.SetRawMultiInfo(EMAIL_ADDRESS, emails); diff --git a/chrome/browser/ui/autofill/autofill_popup_controller.h b/chrome/browser/ui/autofill/autofill_popup_controller.h index e9f6851..a8027a0 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller.h +++ b/chrome/browser/ui/autofill/autofill_popup_controller.h @@ -88,13 +88,13 @@ class AutofillPopupController { // to take in the row index and return a single element, instead of the // whole vector. // The main labels for each autofill item. - virtual const std::vector<string16>& names() const = 0; + virtual const std::vector<base::string16>& names() const = 0; // Smaller labels for each autofill item. - virtual const std::vector<string16>& subtexts() const = 0; + virtual const std::vector<base::string16>& subtexts() const = 0; // A string which identifies the icon to be shown for each autofill item. - virtual const std::vector<string16>& icons() const = 0; + virtual const std::vector<base::string16>& icons() const = 0; // Identifier for the row. virtual const std::vector<int>& identifiers() const = 0; diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index 77b6447..911f7c3 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc @@ -125,9 +125,9 @@ AutofillPopupControllerImpl::AutofillPopupControllerImpl( AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {} void AutofillPopupControllerImpl::Show( - const std::vector<string16>& names, - const std::vector<string16>& subtexts, - const std::vector<string16>& icons, + const std::vector<base::string16>& names, + const std::vector<base::string16>& subtexts, + const std::vector<base::string16>& icons, const std::vector<int>& identifiers) { SetValues(names, subtexts, icons, identifiers); @@ -400,15 +400,16 @@ bool AutofillPopupControllerImpl::hide_on_outside_click() const { return hide_on_outside_click_; } -const std::vector<string16>& AutofillPopupControllerImpl::names() const { +const std::vector<base::string16>& AutofillPopupControllerImpl::names() const { return names_; } -const std::vector<string16>& AutofillPopupControllerImpl::subtexts() const { +const std::vector<base::string16>& AutofillPopupControllerImpl::subtexts() + const { return subtexts_; } -const std::vector<string16>& AutofillPopupControllerImpl::icons() const { +const std::vector<base::string16>& AutofillPopupControllerImpl::icons() const { return icons_; } @@ -570,9 +571,9 @@ bool AutofillPopupControllerImpl::HasSuggestions() { } void AutofillPopupControllerImpl::SetValues( - const std::vector<string16>& names, - const std::vector<string16>& subtexts, - const std::vector<string16>& icons, + const std::vector<base::string16>& names, + const std::vector<base::string16>& subtexts, + const std::vector<base::string16>& icons, const std::vector<int>& identifiers) { names_ = names; full_names_ = names; diff --git a/chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.cc b/chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.cc index 65ea225..61af5ef 100644 --- a/chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.cc +++ b/chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.cc @@ -21,7 +21,7 @@ MockAutofillDialogViewDelegate::MockAutofillDialogViewDelegate() { // sets different defaults. If tests utilizing the MockController start // breaking because of this, use ON_CALL instead. DefaultValue<const DetailInputs&>::Set(default_inputs_); - DefaultValue<string16>::Set(string16()); + DefaultValue<base::string16>::Set(string16()); DefaultValue<GURL>::Set(GURL()); DefaultValue<ValidityMessages>::Set(ValidityMessages()); DefaultValue<gfx::Image>::Set(gfx::Image()); @@ -73,7 +73,7 @@ MockAutofillDialogViewDelegate::~MockAutofillDialogViewDelegate() { DefaultValue<SuggestionState>::Clear(); DefaultValue<gfx::Image>::Clear(); DefaultValue<ValidityMessages>::Clear(); - DefaultValue<string16>::Clear(); + DefaultValue<base::string16>::Clear(); DefaultValue<GURL>::Clear(); DefaultValue<const DetailInputs&>::Clear(); DefaultValue<FieldIconMap>::Clear(); diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc index 6216bc0..8437347 100644 --- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc +++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.cc @@ -114,9 +114,9 @@ void TabAutofillManagerDelegate::ShowRequestAutocompleteDialog( void TabAutofillManagerDelegate::ShowAutofillPopup( const gfx::RectF& element_bounds, base::i18n::TextDirection text_direction, - const std::vector<string16>& values, - const std::vector<string16>& labels, - const std::vector<string16>& icons, + const std::vector<base::string16>& values, + const std::vector<base::string16>& labels, + const std::vector<base::string16>& icons, const std::vector<int>& identifiers, base::WeakPtr<AutofillPopupDelegate> delegate) { // Convert element_bounds to be in screen space. diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h index 3bfb7b3..c588080 100644 --- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h +++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h @@ -53,9 +53,9 @@ class TabAutofillManagerDelegate virtual void ShowAutofillPopup( const gfx::RectF& element_bounds, base::i18n::TextDirection text_direction, - const std::vector<string16>& values, - const std::vector<string16>& labels, - const std::vector<string16>& icons, + const std::vector<base::string16>& values, + const std::vector<base::string16>& labels, + const std::vector<base::string16>& icons, const std::vector<int>& identifiers, base::WeakPtr<AutofillPopupDelegate> delegate) OVERRIDE; virtual void UpdateAutofillPopupDataListValues( diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc index 8429c04..880354c 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc @@ -87,7 +87,7 @@ TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) { GetModel()->bookmark_bar_node(), 0, ASCIIToUTF16("a"), GURL("http://a")); RecentlyUsedFoldersComboModel model(GetModel(), new_node); - std::set<string16> items; + std::set<base::string16> items; for (int i = 0; i < model.GetItemCount(); ++i) { if (!model.IsItemSeparatorAt(i)) EXPECT_EQ(0u, items.count(model.GetItemAt(i))); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h index 6325782..8e62465 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h @@ -13,7 +13,7 @@ // A list of pairs containing the name and URL associated with each // currently active tab in the active browser window. -typedef std::pair<string16, GURL> ActiveTabNameURLPair; +typedef std::pair<base::string16, GURL> ActiveTabNameURLPair; typedef std::vector<ActiveTabNameURLPair> ActiveTabsNameURLPairVector; // A controller for the Bookmark All Tabs sheet which is presented upon diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm index 2c1b7ef..d076a78 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm @@ -37,11 +37,11 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) { ExtensionInstallPrompt::Prompt prompt = chrome::BuildExtensionInstallPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); prompt.SetPermissions(permissions); // No details provided with this permission. - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(string16()); prompt.SetPermissionsDetails(details); @@ -92,11 +92,11 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalOK) { ExtensionInstallPrompt::Prompt prompt = chrome::BuildExtensionInstallPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); prompt.SetPermissions(permissions); // No details provided with this permission. - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(string16()); prompt.SetPermissionsDetails(details); @@ -120,11 +120,11 @@ TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) { ExtensionInstallPrompt::Prompt one_warning_prompt = chrome::BuildExtensionInstallPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); one_warning_prompt.SetPermissions(permissions); // No details provided with this permission. - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(string16()); one_warning_prompt.SetPermissionsDetails(details); @@ -267,11 +267,11 @@ TEST_F(ExtensionInstallViewControllerTest, OAuthIssues) { ExtensionInstallPrompt::Prompt prompt = chrome::BuildExtensionInstallPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); prompt.SetPermissions(permissions); // No details provided with this permission. - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(string16()); prompt.SetPermissionsDetails(details); @@ -309,11 +309,11 @@ TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) { ExtensionInstallPrompt::Prompt prompt = chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); prompt.SetPermissions(permissions); // No details provided with this permission. - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(string16()); prompt.SetPermissionsDetails(details); @@ -338,9 +338,9 @@ TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) { ExtensionInstallPrompt::Prompt prompt = chrome::BuildExtensionInstallPrompt(extension_.get()); - std::vector<string16> permissions; + std::vector<base::string16> permissions; permissions.push_back(UTF8ToUTF16("warning 1")); - std::vector<string16> permissions_details; + std::vector<base::string16> permissions_details; permissions_details.push_back(UTF8ToUTF16("Detail 1")); prompt.SetPermissions(permissions); prompt.SetPermissionsDetails(permissions_details); diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index 551abe9..49b848a 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -87,7 +87,7 @@ class Bridge : public GlobalErrorBubbleViewBase { [iconView_ setImage:image.ToNSImage()]; [title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())]; - std::vector<string16> messages = error_->GetBubbleViewMessages(); + std::vector<base::string16> messages = error_->GetBubbleViewMessages(); base::string16 message = JoinString(messages, '\n'); base::scoped_nsobject<NSMutableAttributedString> messageValue( diff --git a/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm index 442e17c..fc627eb 100644 --- a/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/after_translate_infobar_controller.mm @@ -15,7 +15,7 @@ using InfoBarUtilities::VerifyControlOrderAndSpacing; - (void)loadLabelText { autodeterminedSourceLanguage_ = ([self delegate]->original_language_index() == TranslateInfoBarDelegate::kNoIndex); - std::vector<string16> strings; + std::vector<base::string16> strings; TranslateInfoBarDelegate::GetAfterTranslateStrings( &strings, &swappedLanugageButtons_, autodeterminedSourceLanguage_); DCHECK_EQ(autodeterminedSourceLanguage_ ? 2U : 3U, strings.size()); diff --git a/chrome/browser/ui/global_error/global_error.h b/chrome/browser/ui/global_error/global_error.h index 23d0175..d87a135 100644 --- a/chrome/browser/ui/global_error/global_error.h +++ b/chrome/browser/ui/global_error/global_error.h @@ -73,7 +73,7 @@ class GlobalErrorWithStandardBubble // Returns the messages for the bubble view, one per line. Multiple messages // are only supported on Views. // TODO(yoz): Add multi-line support for GTK and Cocoa. - virtual std::vector<string16> GetBubbleViewMessages() = 0; + virtual std::vector<base::string16> GetBubbleViewMessages() = 0; // Returns the accept button label for the bubble view. virtual base::string16 GetBubbleViewAcceptButtonLabel() = 0; // Returns the cancel button label for the bubble view. To hide the cancel diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc index cb731e5..ae23831 100644 --- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc +++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc @@ -36,8 +36,8 @@ class BubbleViewError : public GlobalErrorWithStandardBubble { virtual base::string16 GetBubbleViewTitle() OVERRIDE { return base::string16(); } - virtual std::vector<string16> GetBubbleViewMessages() OVERRIDE { - return std::vector<string16>(); + virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE { + return std::vector<base::string16>(); } virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE { return base::string16(); diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc index bd9d3b1..2468058 100644 --- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc @@ -53,7 +53,7 @@ void AddResourceIcon(const gfx::ImageSkia* icon, void* data) { } // Returns an expander with the lines in |details|. -GtkWidget* CreateDetailsWidget(const std::vector<string16>& details, +GtkWidget* CreateDetailsWidget(const std::vector<base::string16>& details, int width, bool show_bullets) { GtkWidget* expander = gtk_expander_new( @@ -291,7 +291,7 @@ ExtensionInstallDialog::ExtensionInstallDialog( gtk_box_pack_start(GTK_BOX(permission_vbox), permission_label, FALSE, FALSE, 0); if (!prompt.GetPermissionsDetails(i).empty()) { - std::vector<string16> details; + std::vector<base::string16> details; details.push_back(prompt.GetPermissionsDetails(i)); gtk_box_pack_start( GTK_BOX(permission_vbox), @@ -349,7 +349,7 @@ ExtensionInstallDialog::ExtensionInstallDialog( gtk_box_pack_start(GTK_BOX(retained_files_container), retained_files_header, FALSE, FALSE, 0); - std::vector<string16> paths; + std::vector<base::string16> paths; for (size_t i = 0; i < prompt.GetRetainedFileCount(); ++i) { paths.push_back(prompt.GetRetainedFile(i)); } diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc index bebbdb5..0c4e2e3 100644 --- a/chrome/browser/ui/gtk/global_error_bubble.cc +++ b/chrome/browser/ui/gtk/global_error_bubble.cc @@ -56,7 +56,7 @@ GlobalErrorBubble::GlobalErrorBubble( GtkWidget* title_label = theme_service->BuildLabel( UTF16ToUTF8(error_->GetBubbleViewTitle()), ui::kGdkBlack); - std::vector<string16> messages = error_->GetBubbleViewMessages(); + std::vector<base::string16> messages = error_->GetBubbleViewMessages(); for (size_t i = 0; i < messages.size(); ++i) { message_labels_.push_back(theme_service->BuildLabel( UTF16ToUTF8(messages[i]), diff --git a/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc index 41c27e8..7c565f3 100644 --- a/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/after_translate_infobar_gtk.cc @@ -31,7 +31,7 @@ void AfterTranslateInfoBar::PlatformSpecificSetOwner() { GetDelegate()->original_language_index() == TranslateInfoBarDelegate::kNoIndex; - std::vector<string16> strings; + std::vector<base::string16> strings; TranslateInfoBarDelegate::GetAfterTranslateStrings( &strings, &swapped_language_combos, autodetermined_source_language); DCHECK_EQ(autodetermined_source_language ? 2U : 3U, strings.size()); diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc index 510e62f..8aa81ee 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc @@ -208,7 +208,7 @@ void RecentTabsBuilderTestHelper::RegisterRecentTabs( } } -std::vector<string16> +std::vector<base::string16> RecentTabsBuilderTestHelper::GetTabTitlesSortedByRecency() { std::vector<TitleTimestampPair> tabs; for (int s = 0; s < GetSessionCount(); ++s) { @@ -223,7 +223,7 @@ RecentTabsBuilderTestHelper::GetTabTitlesSortedByRecency() { } sort(tabs.begin(), tabs.end(), SortTabTimesByRecency); - std::vector<string16> titles; + std::vector<base::string16> titles; for (size_t i = 0; i < tabs.size(); ++i) titles.push_back(tabs[i].title); return titles; diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h index 4d5727c..f80d30f 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h +++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h @@ -51,7 +51,7 @@ class RecentTabsBuilderTestHelper { void RegisterRecentTabs(browser_sync::SessionModelAssociator* associator); - std::vector<string16> GetTabTitlesSortedByRecency(); + std::vector<base::string16> GetTabTitlesSortedByRecency(); private: void BuildSessionSpecifics(int session_index, diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc index 97b27ae..385379c 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc @@ -439,7 +439,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxSessionsAndRecency) { int num_items = model.GetItemCount(); EXPECT_EQ(12, num_items); - std::vector<string16> tab_titles = + std::vector<base::string16> tab_titles = recent_tabs_builder.GetTabTitlesSortedByRecency(); EXPECT_EQ(tab_titles[0], model.GetLabelAt(3)); EXPECT_EQ(tab_titles[1], model.GetLabelAt(6)); @@ -474,7 +474,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) { int num_items = model.GetItemCount(); EXPECT_EQ(9, num_items); - std::vector<string16> tab_titles = + std::vector<base::string16> tab_titles = recent_tabs_builder.GetTabTitlesSortedByRecency(); for (int i = 0; i < 4; ++i) EXPECT_EQ(tab_titles[i], model.GetLabelAt(i + 3)); diff --git a/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.cc b/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.cc index e088b10..d581c8b 100644 --- a/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.cc @@ -174,10 +174,11 @@ void SuspiciousExtensionBubbleView::Init() { extensions->SetMultiLine(true); extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT); - std::vector<string16> extension_list; + std::vector<base::string16> extension_list; char16 bullet_point = 0x2022; - std::vector<string16> suspicious = controller_->GetSuspiciousExtensionNames(); + std::vector<base::string16> suspicious = + controller_->GetSuspiciousExtensionNames(); size_t i = 0; for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) { // Add each extension with bullet point. diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index 2144bac..1ed157b 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -81,7 +81,7 @@ GlobalErrorBubbleView::GlobalErrorBubbleView( title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); title_label->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont)); - std::vector<string16> message_strings(error_->GetBubbleViewMessages()); + std::vector<base::string16> message_strings(error_->GetBubbleViewMessages()); std::vector<views::Label*> message_labels; for (size_t i = 0; i < message_strings.size(); ++i) { views::Label* message_label = new views::Label(message_strings[i]); diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.cc b/chrome/browser/ui/views/infobars/after_translate_infobar.cc index 79e949d..f9d9825 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.cc @@ -88,7 +88,7 @@ void AfterTranslateInfoBar::ViewHierarchyChanged( return; } - std::vector<string16> strings; + std::vector<base::string16> strings; TranslateInfoBarDelegate::GetAfterTranslateStrings( &strings, &swapped_language_buttons_, autodetermined_source_language_); DCHECK_EQ(autodetermined_source_language_ ? 2U : 3U, strings.size()); diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 777bdb3..f94d891 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -59,7 +59,7 @@ class CertificateSelectorTableModel : public ui::TableModel { virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE; private: - std::vector<string16> items_; + std::vector<base::string16> items_; DISALLOW_COPY_AND_ASSIGN(CertificateSelectorTableModel); }; diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc index d361370..4350bed 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -117,7 +117,7 @@ class TranslateDenialComboboxModel : public ui::ComboboxModel { return 0; } - std::vector<string16> items_; + std::vector<base::string16> items_; DISALLOW_COPY_AND_ASSIGN(TranslateDenialComboboxModel); }; diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index 77686ac..8fc784d 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -51,7 +51,7 @@ class UninstallView : public views::ButtonListener, virtual base::string16 GetItemAt(int index) OVERRIDE; private: - typedef std::map<string16, base::string16> BrowsersMap; + typedef std::map<base::string16, base::string16> BrowsersMap; // Initializes the controls on the dialog. void SetupControls(); diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index acf2ed5..05879c7 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -459,10 +459,10 @@ std::string AboutDiscards(const std::string& path) { chromeos::OomPriorityManager* oom = g_browser_process->platform_part()->oom_priority_manager(); - std::vector<string16> titles = oom->GetTabTitles(); + std::vector<base::string16> titles = oom->GetTabTitles(); if (!titles.empty()) { output.append("<ul>"); - std::vector<string16>::iterator it = titles.begin(); + std::vector<base::string16>::iterator it = titles.begin(); for ( ; it != titles.end(); ++it) { std::string title = UTF16ToUTF8(*it); title = net::EscapeForHTML(title); diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc index 612d8fb..8910eca 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc @@ -115,9 +115,9 @@ const Extension* ExtensionSettingsUIBrowserTest::InstallExtension( VLOG(1) << " " << (*it)->id(); VLOG(1) << "Errors follow:"; - const std::vector<string16>* errors = + const std::vector<base::string16>* errors = ExtensionErrorReporter::GetInstance()->GetErrors(); - for (std::vector<string16>::const_iterator iter = errors->begin(); + for (std::vector<base::string16>::const_iterator iter = errors->begin(); iter != errors->end(); ++iter) VLOG(1) << *iter; diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index defae47..7077915 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc @@ -80,7 +80,7 @@ void GetValueList(const AutofillProfile& profile, scoped_ptr<ListValue>* list) { list->reset(new ListValue); - std::vector<string16> values; + std::vector<base::string16> values; profile.GetRawMultiInfo(type, &values); // |GetRawMultiInfo()| always returns at least one, potentially empty, item. @@ -96,7 +96,7 @@ void GetValueList(const AutofillProfile& profile, void SetValueList(const ListValue* list, ServerFieldType type, AutofillProfile* profile) { - std::vector<string16> values(list->GetSize()); + std::vector<base::string16> values(list->GetSize()); for (size_t i = 0; i < list->GetSize(); ++i) { base::string16 value; if (list->GetString(i, &value)) @@ -110,9 +110,9 @@ void GetNameList(const AutofillProfile& profile, scoped_ptr<ListValue>* names) { names->reset(new ListValue); - std::vector<string16> first_names; - std::vector<string16> middle_names; - std::vector<string16> last_names; + std::vector<base::string16> first_names; + std::vector<base::string16> middle_names; + std::vector<base::string16> last_names; profile.GetRawMultiInfo(autofill::NAME_FIRST, &first_names); profile.GetRawMultiInfo(autofill::NAME_MIDDLE, &middle_names); profile.GetRawMultiInfo(autofill::NAME_LAST, &last_names); @@ -137,9 +137,9 @@ void GetNameList(const AutofillProfile& profile, // Set the multi-valued element for |type| from input |list| values. void SetNameList(const ListValue* names, AutofillProfile* profile) { const size_t size = names->GetSize(); - std::vector<string16> first_names(size); - std::vector<string16> middle_names(size); - std::vector<string16> last_names(size); + std::vector<base::string16> first_names(size); + std::vector<base::string16> middle_names(size); + std::vector<base::string16> last_names(size); for (size_t i = 0; i < size; ++i) { const ListValue* name; diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc index 97e2b72..197a60f 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc @@ -200,10 +200,10 @@ ListValue* CrosLanguageOptionsHandler::GetLanguageListInternal( // display names using ICU comparator, but doing it is hard, thus we'll // use an auxiliary vector to achieve the same result. typedef std::pair<std::string, base::string16> LanguagePair; - typedef std::map<string16, LanguagePair> LanguageMap; + typedef std::map<base::string16, LanguagePair> LanguageMap; LanguageMap language_map; // The auxiliary vector mentioned above. - std::vector<string16> display_names; + std::vector<base::string16> display_names; // Build the list of display names, and build the language map. for (std::set<std::string>::const_iterator iter = language_codes.begin(); diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index bc835f3..848de8c 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc @@ -67,10 +67,10 @@ ListValue* LanguageOptionsHandler::GetLanguageList() { // display names using ICU comparator, but doing it is hard, thus we'll // use an auxiliary vector to achieve the same result. typedef std::pair<std::string, base::string16> LanguagePair; - typedef std::map<string16, LanguagePair> LanguageMap; + typedef std::map<base::string16, LanguagePair> LanguageMap; LanguageMap language_map; // The auxiliary vector mentioned above. - std::vector<string16> display_names; + std::vector<base::string16> display_names; // Build the list of display names, and build the language map. for (size_t i = 0; i < language_codes.size(); ++i) { diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc index b0d2dff..af9558a 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc @@ -381,7 +381,7 @@ void AutofillProfileSyncableService::WriteAutofillProfile( specifics->set_guid(profile.guid()); specifics->set_origin(profile.origin()); - std::vector<string16> values; + std::vector<base::string16> values; profile.GetRawMultiInfo(autofill::NAME_FIRST, &values); for (size_t i = 0; i < values.size(); ++i) { specifics->add_name_first(LimitData(UTF16ToUTF8(values[i]))); @@ -579,7 +579,7 @@ bool AutofillProfileSyncableService::UpdateMultivaluedField( ServerFieldType field_type, const ::google::protobuf::RepeatedPtrField<std::string>& new_values, AutofillProfile* autofill_profile) { - std::vector<string16> values; + std::vector<base::string16> values; autofill_profile->GetRawMultiInfo(field_type, &values); bool changed = false; if (static_cast<size_t>(new_values.size()) != values.size()) { diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc index 3d1971b..58be6e6 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc @@ -534,7 +534,7 @@ TEST_F(AutofillProfileSyncableServiceTest, UpdateField) { TEST_F(AutofillProfileSyncableServiceTest, UpdateMultivaluedField) { AutofillProfile profile(kGuid1, kHttpsOrigin); - std::vector<string16> values; + std::vector<base::string16> values; values.push_back(UTF8ToUTF16("1@1.com")); values.push_back(UTF8ToUTF16("2@1.com")); profile.SetRawMultiInfo(autofill::EMAIL_ADDRESS, values); @@ -570,7 +570,7 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) { profile1.SetRawInfo( autofill::ADDRESS_HOME_LINE1, UTF8ToUTF16("111 First St.")); - std::vector<string16> values; + std::vector<base::string16> values; values.push_back(UTF8ToUTF16("1@1.com")); values.push_back(UTF8ToUTF16("2@1.com")); profile1.SetRawMultiInfo(autofill::EMAIL_ADDRESS, values); diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index ee1b3f4..0952ac4 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -630,7 +630,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) { " ORDER BY id ASC"; sql::Statement s(db_->GetUniqueStatement(sql.c_str())); base::string16 placeholder_keyword(ASCIIToUTF16("dummy")); - std::set<string16> keywords; + std::set<base::string16> keywords; while (s.Step()) { base::string16 keyword(s.ColumnString16(1)); bool generate_keyword = keyword.empty() || s.ColumnBool(3); |