Convert string16 to base::string16 in content.

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
@@ skipping 521 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetCookieOnIOThread, url, value,
                  make_scoped_refptr(context_getter), &event, &result));
   event.Wait();
   return result;
 }
 
 TitleWatcher::TitleWatcher(WebContents* web_contents,
-                           const string16& expected_title)
+                           const base::string16& expected_title)
     : WebContentsObserver(web_contents),
       message_loop_runner_(new MessageLoopRunner) {
   EXPECT_TRUE(web_contents != NULL);
   expected_titles_.push_back(expected_title);
 }
 
-void TitleWatcher::AlsoWaitForTitle(const string16& expected_title) {
+void TitleWatcher::AlsoWaitForTitle(const base::string16& expected_title) {
   expected_titles_.push_back(expected_title);
 }
 
 TitleWatcher::~TitleWatcher() {
 }
 
-const string16& TitleWatcher::WaitAndGetTitle() {
+const base::string16& TitleWatcher::WaitAndGetTitle() {
   message_loop_runner_->Run();
   return observed_title_;
 }
 
 void TitleWatcher::DidStopLoading(RenderViewHost* render_view_host) {
   // When navigating through the history, the restored NavigationEntry's title
   // will be used. If the entry ends up having the same title after we return
   // to it, as will usually be the case, then WebContentsObserver::TitleSet
   // will then be suppressed, since the NavigationEntry's title hasn't changed.
   TestTitle();
 }
 
 void TitleWatcher::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
   TestTitle();
 }
 
 void TitleWatcher::TestTitle() {
-  std::vector<string16>::const_iterator it =
+  std::vector<base::string16>::const_iterator it =
       std::find(expected_titles_.begin(),
                 expected_titles_.end(),
                 web_contents()->GetTitle());
   if (it == expected_titles_.end())
     return;
 
   observed_title_ = *it;
   message_loop_runner_->Quit();
 }
 
@@ skipping 49 matching lines @@
   // The queue should not be empty, unless we were quit because of a timeout.
   if (message_queue_.empty())
     return false;
   if (message)
     *message = message_queue_.front();
   message_queue_.pop();
   return true;
 }
 
 }  // namespace content