Move StringPiece into the base namespace. It is colliding

app/resource_bundle.h

 // Copyright (c) 2006-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.
 
 #ifndef APP_RESOURCE_BUNDLE_H_
 #define APP_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 15 matching lines @@
 }
 #endif
 #if defined(USE_X11)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 namespace gfx {
 class Font;
 }
 class SkBitmap;
 typedef uint32 SkColor;
+namespace base {
 class StringPiece;
+}
 
 #if defined(OS_MACOSX)
 #ifdef __OBJC__
 @class NSImage;
 #else
 class NSImage;
 #endif  // __OBJC__
 #endif  // defined(OS_MACOSX)
 
 // ResourceBundle is a central facility to load images and other resources,
@@ skipping 51 matching lines @@
                              std::vector<unsigned char>* bytes);
 
   // Return the contents of a file in a string given the resource id.
   // This will copy the data from the resource and return it as a string.
   // TODO(port): deprecate this and replace with GetRawDataResource to avoid
   // needless copying.
   std::string GetDataResource(int resource_id);
 
   // Like GetDataResource(), but avoids copying the resource.  Instead, it
   // returns a StringPiece which points into the actual resource in the image.
-  StringPiece GetRawDataResource(int resource_id);
+  base::StringPiece GetRawDataResource(int resource_id);
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
   string16 GetLocalizedString(int message_id);
 
   // Returns the font for the specified style.
   gfx::Font GetFont(FontStyle style);
 
 #if defined(OS_WIN)
   // Loads and returns an icon from the theme dll.
@@ skipping 101 matching lines @@
   scoped_ptr<gfx::Font> medium_bold_font_;
   scoped_ptr<gfx::Font> large_font_;
   scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
 #endif  // APP_RESOURCE_BUNDLE_H_