Replace string16 with base::string16.

chrome/browser/do_not_track_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 10 matching lines @@
   ASSERT_TRUE(test_server()->Start());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
 
   GURL url = test_server()->GetURL("echoheader?DNT");
   ui_test_utils::NavigateToURL(browser(), url);
 
   int matches = ui_test_utils::FindInPage(
       browser()->tab_strip_model()->GetActiveWebContents(),
-      string16(ASCIIToUTF16("1")),
+      base::string16(ASCIIToUTF16("1")),
       true /* forward */, false /* match case */, NULL /* ordinal */,
       NULL /* selection_rect */);
 
   EXPECT_EQ(1, matches);
 }
 
 // Check that the DNT header is preserved during redirects.
 IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Redirect) {
   ASSERT_TRUE(test_server()->Start());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
 
   GURL final_url = test_server()->GetURL("echoheader?DNT");
   GURL url = test_server()->GetURL(
       std::string("server-redirect?") + final_url.spec());
   ui_test_utils::NavigateToURL(browser(), url);
 
   int matches = ui_test_utils::FindInPage(
       browser()->tab_strip_model()->GetActiveWebContents(),
-      string16(ASCIIToUTF16("1")),
+      base::string16(ASCIIToUTF16("1")),
       true /* forward */, false /* match case */, NULL /* ordinal */,
       NULL /* selection_rect */);
 
   EXPECT_EQ(1, matches);
 }
 
 // Check that the DOM property is set when the corresponding preference is set.
 IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
@@ skipping 12 matching lines @@
   // renderer.
   prefs->SetBoolean(prefs::kEnableDoNotTrack, false);
 
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send("
       "    navigator.doNotTrack === null ? '0' : '1')",
       &do_not_track));
   EXPECT_EQ("0", do_not_track);
 }