Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4145)

Unified Diff: chrome/browser/autocomplete/autocomplete_browsertest.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_browsertest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc
index 732920ac34dc17df9e17af725b99e12c82b71c97..eb0a59fe4059321dc5efd54c2707d36f61da206b 100644
--- a/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -36,7 +36,7 @@
namespace {
-string16 AutocompleteResultAsString(const AutocompleteResult& result) {
+base::string16 AutocompleteResultAsString(const AutocompleteResult& result) {
std::string output(base::StringPrintf("{%" PRIuS "} ", result.size()));
for (size_t i = 0; i < result.size(); ++i) {
AutocompleteMatch match = result.match_at(i);
@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
{
omnibox_view->model()->SetInputInProgress(true);
autocomplete_controller->Start(AutocompleteInput(
- ASCIIToUTF16("chrome"), string16::npos, string16(), GURL(),
+ ASCIIToUTF16("chrome"), base::string16::npos, base::string16(), GURL(),
AutocompleteInput::NTP, true, false, true,
AutocompleteInput::SYNCHRONOUS_MATCHES));
@@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
LocationBar* location_bar = GetLocationBar();
OmniboxView* omnibox_view = location_bar->GetOmniboxView();
EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
- omnibox_view->SetUserText(string16());
+ omnibox_view->SetUserText(base::string16());
content::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/autocomplete/autocomplete_classifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698