Move StringPiece into the base namespace. It is colliding

with the StringPiece class in icu4.2, which is a problem
when trying to use the system version of icu.

Review URL: http://codereview.chromium.org/193072


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm
index e96ed54..6696617 100644
--- a/app/resource_bundle_mac.mm
+++ b/app/resource_bundle_mac.mm
@@ -75,7 +75,7 @@ void ResourceBundle::LoadThemeResources() {
 bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id,
                                        std::vector<unsigned char>* bytes) {
   DCHECK(module);
-  StringPiece data;
+  base::StringPiece data;
   if (!module->Get(resource_id, &data))
     return false;
 
@@ -85,11 +85,11 @@ bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id,
   return true;
 }
 
-StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
+base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
   DCHECK(resources_data_);
-  StringPiece data;
+  base::StringPiece data;
   if (!resources_data_->Get(resource_id, &data))
-    return StringPiece();
+    return base::StringPiece();
   return data;
 }
 
@@ -101,7 +101,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
     return string16();
   }
 
-  StringPiece data;
+  base::StringPiece data;
   if (!locale_resources_data_->Get(message_id, &data)) {
     // Fall back on the main data pack (shouldn't be any strings here except in
     // unittests).