summaryrefslogtreecommitdiffstats
path: root/base/data_pack_unittest.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:08:39 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:08:39 +0000
commit8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch)
tree5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /base/data_pack_unittest.cc
parentf8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff)
downloadchromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip
chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz
chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2
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
Diffstat (limited to 'base/data_pack_unittest.cc')
-rw-r--r--base/data_pack_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/data_pack_unittest.cc b/base/data_pack_unittest.cc
index 71c37e5..7c2cfeb 100644
--- a/base/data_pack_unittest.cc
+++ b/base/data_pack_unittest.cc
@@ -24,7 +24,7 @@ TEST_F(DataPackTest, Load) {
base::DataPack pack;
ASSERT_TRUE(pack.Load(data_path_));
- StringPiece data;
+ base::StringPiece data;
ASSERT_TRUE(pack.Get(4, &data));
EXPECT_EQ("this is id 4", data);
ASSERT_TRUE(pack.Get(6, &data));