Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 314 matching lines @@
                                WebString::fromUTF8(edit_command_value_));
 }
 
 void TestWebViewDelegate::spellCheck(const WebString& text,
                                      int& misspelledOffset,
                                      int& misspelledLength) {
 #if defined(OS_MACOSX)
   // Check the spelling of the given text.
   // TODO(hbono): rebaseline layout-test results of Windows and Linux so we
   // can enable this mock spellchecker on them.
-  string16 word(text);
+  base::string16 word(text);
   mock_spellcheck_.SpellCheckWord(word, &misspelledOffset, &misspelledLength);
 #endif
 }
 
 WebString TestWebViewDelegate::autoCorrectWord(const WebString& word) {
   // Returns an empty string as Mac WebKit ('WebKitSupport/WebEditorClient.mm')
   // does. (If this function returns a non-empty string, WebKit replaces the
   // given misspelled string with the result one. This process executes some
   // editor commands and causes layout-test failures.)
   return WebString();
@@ skipping 628 matching lines @@
     return;
 
   const WebHistoryItem& history_item =
       shell_->webView()->mainFrame()->previousHistoryItem();
   if (history_item.isNull())
     return;
 
   entry->SetContentState(webkit_glue::HistoryItemToString(history_item));
 }
 
-string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
+base::string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
   std::string name = UTF16ToUTF8(webframe->uniqueName());
 
   if (webframe == shell_->webView()->mainFrame()) {
     if (name.length())
       name = "main frame \"" + name + "\"";
     else
       name = "main frame";
   } else {
     if (name.length())
       name = "frame \"" + name + "\"";
     else
       name = "frame (anonymous)";
   }
   return UTF8ToUTF16(name);
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }