Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_shell_win.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 "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 160 matching lines @@
   void* font_ptr;
   size_t font_size;
   if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL),
       IDR_AHEM_FONT, &font_ptr, &font_size)) {
     HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts);
     DCHECK(rc != 0);
   }
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
-    string16 dir(
+    base::string16 dir(
         parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps));
     if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) {
         new google_breakpad::ExceptionHandler(
             dir,  // dump_path
             NULL,  // filter
             &MinidumpCallback,  // callback
             NULL,  // callback_context
             google_breakpad::ExceptionHandler::HANDLER_ALL,  // handler_types
             kFullDumpType,  // dump_type
             static_cast<const wchar_t*>(NULL),  // pipe_name
@@ skipping 34 matching lines @@
     LoadIcon(instance_handle_, MAKEINTRESOURCE(IDI_TESTSHELL)),
     LoadCursor(NULL, IDC_ARROW),
     0,
     MAKEINTRESOURCE(IDC_TESTSHELL),
     g_windowClass,
     LoadIcon(instance_handle_, MAKEINTRESOURCE(IDI_SMALL)),
   };
   return RegisterClassEx(&wcex);
 }
 
-void TestShell::DumpAllBackForwardLists(string16* result) {
+void TestShell::DumpAllBackForwardLists(base::string16* result) {
   result->clear();
   for (WindowList::iterator iter = TestShell::windowList()->begin();
      iter != TestShell::windowList()->end(); iter++) {
     HWND hwnd = *iter;
     TestShell* shell =
         static_cast<TestShell*>(ui::GetWindowUserData(hwnd));
     shell->DumpBackForwardList(result);
   }
 }
 
 std::string TestShell::RewriteLocalUrl(const std::string& url) {
   // Convert file:///tmp/LayoutTests urls to the actual location on disk.
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   std::string new_url(url);
   if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
     base::FilePath replace_url;
     PathService::Get(base::DIR_EXE, &replace_url);
     replace_url = replace_url.DirName();
     replace_url = replace_url.DirName();
     replace_url = replace_url.AppendASCII("third_party");
     replace_url = replace_url.AppendASCII("WebKit");
     replace_url = replace_url.AppendASCII("LayoutTests");
-    string16 replace_url_str = replace_url.value();
+    base::string16 replace_url_str = replace_url.value();
     replace_url_str.push_back(L'/');
     new_url = std::string("file:///") +
               UTF16ToUTF8(replace_url_str).append(url.substr(kPrefixLen));
   }
   return new_url;
 }
 
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 207 matching lines @@
   GetClientRect(m_mainWnd, &rc);
 
   int x = BUTTON_WIDTH * 4;
   MoveWindow(m_editWnd, x, 0, rc.right - x, URLBAR_HEIGHT, TRUE);
 
   MoveWindow(webViewWnd(), 0, URLBAR_HEIGHT, rc.right,
              rc.bottom - URLBAR_HEIGHT, TRUE);
 }
 
 void TestShell::LoadURLForFrame(const GURL& url,
-                                const string16& frame_name) {
+                                const base::string16& frame_name) {
   if (!url.is_valid())
     return;
 
   TRACE_EVENT_BEGIN_ETW("url.load", this, url.spec());
 
   if (IsSVGTestURL(url)) {
     SizeToSVG();
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
@@ skipping 162 matching lines @@
 void TestShell::ShowStartupDebuggingDialog() {
   MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
 }
 
 // static
 base::StringPiece TestShell::ResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 
-string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
+base::string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
   wchar_t localized[MAX_LOADSTRING];
   int length = LoadString(GetModuleHandle(NULL), message_id,
                           localized, MAX_LOADSTRING);
   if (!length && GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND) {
     NOTREACHED();
     return L"No string for this identifier!";
   }
-  return string16(localized, length);
+  return base::string16(localized, length);
 }
 
 // TODO(tc): Convert this to using resources from test_shell.rc.
 base::StringPiece TestShellWebKitInit::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
@@ skipping 45 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue