Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_shell.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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 397 matching lines @@
 
 void TestShell::TestTimedOut() {
   puts("#TEST_TIMED_OUT\n");
   TestFinished();
 }
 
 void TestShell::Show(WebNavigationPolicy policy) {
   delegate_->show(policy);
 }
 
-void TestShell::DumpBackForwardEntry(int index, string16* result) {
+void TestShell::DumpBackForwardEntry(int index, base::string16* result) {
   int current_index = navigation_controller_->GetLastCommittedEntryIndex();
 
   std::string content_state =
       navigation_controller_->GetEntryAtIndex(index)->GetContentState();
   if (content_state.empty()) {
     content_state = webkit_glue::CreateHistoryStateForURL(
         navigation_controller_->GetEntryAtIndex(index)->GetURL());
   }
 
   result->append(
       webkit_glue::DumpHistoryState(content_state, 8, index == current_index));
 }
 
-void TestShell::DumpBackForwardList(string16* result) {
+void TestShell::DumpBackForwardList(base::string16* result) {
   result->append(ASCIIToUTF16(
                      "\n============== Back Forward List ==============\n"));
 
   for (int i = 0; i < navigation_controller_->GetEntryCount(); ++i)
     DumpBackForwardEntry(i, result);
 
   result->append(ASCIIToUTF16(
                      "===============================================\n"));
 }
 
@@ skipping 53 matching lines @@
 }
 
 void TestShell::ResetTestController() {
   notification_presenter_->Reset();
   delegate_->Reset();
   if (geolocation_client_mock_.get())
     geolocation_client_mock_->resetMock();
 }
 
 void TestShell::LoadFile(const base::FilePath& file) {
-  LoadURLForFrame(net::FilePathToFileURL(file), string16());
+  LoadURLForFrame(net::FilePathToFileURL(file), base::string16());
 }
 
 void TestShell::LoadURL(const GURL& url) {
-  LoadURLForFrame(url, string16());
+  LoadURLForFrame(url, base::string16());
 }
 
 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
   // Get the right target frame for the entry.
   WebFrame* frame = webView()->mainFrame();
   if (!entry.GetTargetFrame().empty())
       frame = webView()->findFrameByName(entry.GetTargetFrame());
 
   // TODO(mpcomplete): should we clear the target frame, or should
   // back/forward navigations maintain the target frame?
@@ skipping 50 matching lines @@
 void TestShell::DumpRenderTree() {
   base::FilePath file_path;
   if (!PromptForSaveFile(L"Dump render tree", &file_path))
     return;
 
   const std::string data =
       UTF16ToUTF8(webkit_glue::DumpRenderer(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
-string16 TestShell::GetDocumentText() {
+base::string16 TestShell::GetDocumentText() {
   return webkit_glue::DumpDocumentText(webView()->mainFrame());
 }
 
 void TestShell::Reload() {
     navigation_controller_->Reload();
 }
 
 void TestShell::SetFocus(WebWidgetHost* host, bool enable) {
   if (!layout_test_mode_) {
     InteractiveSetFocus(host, enable);
@@ skipping 27 matching lines @@
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }