summaryrefslogtreecommitdiffstats
path: root/chrome/browser/referrer_policy_browsertest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 19:14:40 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 19:14:40 +0000
commita04db824d215692e471a1c21f8b8422eebdb3223 (patch)
tree5535c4b74b85444774b4bcd33e72be406543da88 /chrome/browser/referrer_policy_browsertest.cc
parentcd7964025d2a2b9dc285bc52020ab907c7950f6a (diff)
downloadchromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.zip
chromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.tar.gz
chromium_src-a04db824d215692e471a1c21f8b8422eebdb3223.tar.bz2
Convert string16 to base::string16 in chrome/browser
TBR=sky Review URL: https://codereview.chromium.org/112943002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/referrer_policy_browsertest.cc')
-rw-r--r--chrome/browser/referrer_policy_browsertest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc
index c444567..e7fb9a5 100644
--- a/chrome/browser/referrer_policy_browsertest.cc
+++ b/chrome/browser/referrer_policy_browsertest.cc
@@ -70,7 +70,7 @@ class ReferrerPolicyTest : public InProcessBrowserTest {
// Returns the expected title for the tab with the given (full) referrer and
// the expected modification of it.
- string16 GetExpectedTitle(const GURL& url,
+ base::string16 GetExpectedTitle(const GURL& url,
ExpectedReferrer expected_referrer) {
std::string referrer;
switch (expected_referrer) {
@@ -140,7 +140,8 @@ class ReferrerPolicyTest : public InProcessBrowserTest {
ui_test_utils::WindowedTabAddedNotificationObserver tab_added_observer(
content::NotificationService::AllSources());
- string16 expected_title = GetExpectedTitle(start_url, expected_referrer);
+ base::string16 expected_title =
+ GetExpectedTitle(start_url, expected_referrer);
content::WebContents* tab =
browser()->tab_strip_model()->GetActiveWebContents();
content::TitleWatcher title_watcher(tab, expected_title);
@@ -380,7 +381,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, History) {
// Navigate to C.
ui_test_utils::NavigateToURL(browser(), test_server_->GetURL(std::string()));
- string16 expected_title =
+ base::string16 expected_title =
GetExpectedTitle(start_url, EXPECT_ORIGIN_AS_REFERRER);
content::WebContents* tab =
browser()->tab_strip_model()->GetActiveWebContents();