diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 20:43:31 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 20:43:31 +0000 |
commit | ca77581c3138913ae4816043d591d1dc4e01eaad (patch) | |
tree | 5793efde9b235b339fdd99189270f1143cf1c7b7 /components/sessions/serialized_navigation_entry_unittest.cc | |
parent | 464cddaa575a10f5733bfebec77fb6b569dcdd17 (diff) | |
download | chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.zip chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.tar.gz chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.tar.bz2 |
Use base namespace for string16 in components and cloud_print.
R=scottbyer@chromium.org
TBR=scottbyer
Review URL: https://codereview.chromium.org/107383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/sessions/serialized_navigation_entry_unittest.cc')
-rw-r--r-- | components/sessions/serialized_navigation_entry_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc index b96d3b4..f029b5b 100644 --- a/components/sessions/serialized_navigation_entry_unittest.cc +++ b/components/sessions/serialized_navigation_entry_unittest.cc @@ -33,7 +33,7 @@ const content::Referrer kReferrer = content::Referrer(GURL("http://www.referrer.com"), blink::WebReferrerPolicyAlways); const GURL kVirtualURL("http://www.virtual-url.com"); -const string16 kTitle = ASCIIToUTF16("title"); +const base::string16 kTitle = ASCIIToUTF16("title"); const content::PageState kPageState = content::PageState::CreateFromEncodedData("page state"); const content::PageTransition kTransitionType = @@ -46,7 +46,7 @@ const int64 kPostID = 100; const GURL kOriginalRequestURL("http://www.original-request.com"); const bool kIsOverridingUserAgent = true; const base::Time kTimestamp = syncer::ProtoTimeToTime(100); -const string16 kSearchTerms = ASCIIToUTF16("my search terms"); +const base::string16 kSearchTerms = ASCIIToUTF16("my search terms"); const GURL kFaviconURL("http://virtual-url.com/favicon.ico"); const int kHttpStatusCode = 404; @@ -230,7 +230,7 @@ TEST(SerializedNavigationEntryTest, ToNavigationEntry) { new_navigation_entry->GetOriginalRequestURL()); EXPECT_EQ(kIsOverridingUserAgent, new_navigation_entry->GetIsOverridingUserAgent()); - string16 search_terms; + base::string16 search_terms; new_navigation_entry->GetExtraData(kSearchTermsKey, &search_terms); EXPECT_EQ(kSearchTerms, search_terms); EXPECT_EQ(kHttpStatusCode, new_navigation_entry->GetHttpStatusCode()); |