Move StringPiece into the base namespace. It is colliding

webkit/tools/test_shell/test_shell_win.cc

 // Copyright (c) 2009 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 108 matching lines @@
 // Helper method for getting the path to the test shell resources directory.
 FilePath GetResourcesFilePath() {
   FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("webkit");
   path = path.AppendASCII("tools");
   path = path.AppendASCII("test_shell");
   return path.AppendASCII("resources");
 }
 
-static StringPiece GetRawDataResource(HMODULE module, int resource_id) {
+static base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
   return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
-                                         &data_size) ?
-      StringPiece(static_cast<char*>(data_ptr), data_size) : StringPiece();
+                                         &data_size)
+      ? base::StringPiece(static_cast<char*>(data_ptr), data_size)
+      : base::StringPiece();
 }
 
 // This is called indirectly by the network layer to access resources.
-StringPiece NetResourceProvider(int key) {
+base::StringPiece NetResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 }  // namespace
 
 // Initialize static member variable
 HINSTANCE TestShell::instance_handle_;
 
 /////////////////////////////////////////////////////////////////////////////
 // static methods on TestShell
@@ skipping 499 matching lines @@
   result->assign(info.lpstrFile);
   return true;
 }
 
 // static
 void TestShell::ShowStartupDebuggingDialog() {
   MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
 }
 
 // static
-StringPiece TestShell::NetResourceProvider(int key) {
+base::StringPiece TestShell::NetResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // WebKit glue functions
 
 namespace webkit_glue {
 
 string16 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);
 }
 
 // TODO(tc): Convert this to using resources from test_shell.rc.
-StringPiece GetDataResource(int resource_id) {
+base::StringPiece GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
     static std::string broken_image_data;
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
       path = path.AppendASCII("missingImage.gif");
       bool success = file_util::ReadFileToString(path, &broken_image_data);
       if (!success) {
         LOG(FATAL) << "Failed reading: " << path.value();
@@ skipping 32 matching lines @@
   case IDR_MEDIA_SOUND_NONE_BUTTON:
   case IDR_MEDIA_SOUND_DISABLED:
   case IDR_MEDIA_SLIDER_THUMB:
   case IDR_MEDIA_VOLUME_SLIDER_THUMB:
     return NetResourceProvider(resource_id);
 
   default:
     break;
   }
 
-  return StringPiece();
+  return base::StringPiece();
 }
 
 HCURSOR LoadCursor(int cursor_id) {
   return NULL;
 }
 
 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue