Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_map_unittest.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 "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/dom_storage/dom_storage_map.h"
 
 namespace dom_storage {
 
 TEST(DomStorageMapTest, DomStorageMapBasics) {
-  const string16 kKey(ASCIIToUTF16("key"));
-  const string16 kValue(ASCIIToUTF16("value"));
+  const base::string16 kKey(ASCIIToUTF16("key"));
+  const base::string16 kValue(ASCIIToUTF16("value"));
   const size_t kValueBytes = kValue.size() * sizeof(char16);
   const size_t kItemBytes =
       (kKey.size() + kValue.size()) * sizeof(char16);
-  const string16 kKey2(ASCIIToUTF16("key2"));
+  const base::string16 kKey2(ASCIIToUTF16("key2"));
   const size_t kKey2Bytes = kKey2.size() * sizeof(char16);
-  const string16 kValue2(ASCIIToUTF16("value2"));
+  const base::string16 kValue2(ASCIIToUTF16("value2"));
   const size_t kItem2Bytes =
       (kKey2.size() + kValue2.size()) * sizeof(char16);
   const size_t kQuota = 1024;  // 1K quota for this test.
 
   scoped_refptr<DomStorageMap> map(new DomStorageMap(kQuota));
-  string16 old_value;
+  base::string16 old_value;
   NullableString16 old_nullable_value;
   ValuesMap swap;
   scoped_refptr<DomStorageMap> copy;
 
   // Check the behavior of an empty map.
   EXPECT_EQ(0u, map->Length());
   EXPECT_TRUE(map->Key(0).is_null());
   EXPECT_TRUE(map->Key(100).is_null());
   EXPECT_TRUE(map->GetItem(kKey).is_null());
   EXPECT_FALSE(map->RemoveItem(kKey, &old_value));
@@ skipping 40 matching lines @@
   EXPECT_TRUE(copy->Key(2).is_null());
   EXPECT_EQ(kItemBytes + kItem2Bytes, copy->bytes_used());
 
   map->SwapValues(&swap);
   EXPECT_EQ(2ul, swap.size());
   EXPECT_EQ(0u, map->Length());
   EXPECT_EQ(0u, map->bytes_used());
 }
 
 TEST(DomStorageMapTest, EnforcesQuota) {
-  const string16 kKey = ASCIIToUTF16("test_key");
-  const string16 kValue = ASCIIToUTF16("test_value");
-  const string16 kKey2 = ASCIIToUTF16("test_key_2");
+  const base::string16 kKey = ASCIIToUTF16("test_key");
+  const base::string16 kValue = ASCIIToUTF16("test_value");
+  const base::string16 kKey2 = ASCIIToUTF16("test_key_2");
 
   // A 50 byte quota is too small to hold both keys, so we
   // should see the DomStorageMap enforcing it.
   const size_t kQuota = 50;
 
-  string16 old_value;
+  base::string16 old_value;
   NullableString16 old_nullable_value;
 
   scoped_refptr<DomStorageMap> map(new DomStorageMap(kQuota));
   EXPECT_TRUE(map->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_FALSE(map->SetItem(kKey2, kValue, &old_nullable_value));
   EXPECT_EQ(1u, map->Length());
 
   EXPECT_TRUE(map->RemoveItem(kKey, &old_value));
   EXPECT_EQ(kValue, old_value);
   EXPECT_EQ(0u, map->Length());
   EXPECT_TRUE(map->SetItem(kKey2, kValue, &old_nullable_value));
   EXPECT_EQ(1u, map->Length());
 
   // Verify that the SwapValues method does not do quota checking.
   ValuesMap swap;
   swap[kKey] = NullableString16(kValue, false);
   swap[kKey2] = NullableString16(kValue, false);
   map->SwapValues(&swap);
   EXPECT_GT(map->bytes_used(), kQuota);
 
   // When overbudget, a new value of greater size than the existing value can
   // not be set, but a new value of lesser or equal size can be set.
   EXPECT_TRUE(map->SetItem(kKey, kValue, &old_nullable_value));
-  EXPECT_FALSE(map->SetItem(kKey, string16(kValue + kValue),
+  EXPECT_FALSE(map->SetItem(kKey, base::string16(kValue + kValue),
                             &old_nullable_value));
-  EXPECT_TRUE(map->SetItem(kKey, string16(), &old_nullable_value));
+  EXPECT_TRUE(map->SetItem(kKey, base::string16(), &old_nullable_value));
   EXPECT_EQ(kValue, old_nullable_value.string());
 }
 
 }  // namespace dom_storage