Remove 'using base::string16;' from base/strings/string16.h and remove temporary

base/test/test_reg_util_win_unittest.cc

 // Copyright 2013 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/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/time/time.h"
@@ skipping 19 matching lines @@
     base::win::RegKey key(HKEY_CURRENT_USER);
     key.DeleteKey(fake_test_key_root_.c_str());
     key.DeleteKey(kTestKeyPath);
   }
 
   virtual ~RegistryOverrideManagerTest() {
     base::win::RegKey key(HKEY_CURRENT_USER);
     key.DeleteKey(fake_test_key_root_.c_str());
   }
 
-  void AssertKeyExists(const string16& key_path) {
+  void AssertKeyExists(const base::string16& key_path) {
     base::win::RegKey key;
     ASSERT_EQ(ERROR_SUCCESS,
               key.Open(HKEY_CURRENT_USER, key_path.c_str(), KEY_READ))
         << key_path << " does not exist.";
   }
 
-  void AssertKeyAbsent(const string16& key_path) {
+  void AssertKeyAbsent(const base::string16& key_path) {
     base::win::RegKey key;
     ASSERT_NE(ERROR_SUCCESS,
               key.Open(HKEY_CURRENT_USER, key_path.c_str(), KEY_READ))
         << key_path << " exists but it should not.";
   }
 
-  void CreateKey(const string16& key_path) {
+  void CreateKey(const base::string16& key_path) {
     base::win::RegKey key;
     EXPECT_EQ(ERROR_SUCCESS,
               key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_ALL_ACCESS));
   }
 
-  string16 FakeOverrideManagerPath(const base::Time& time) {
+  base::string16 FakeOverrideManagerPath(const base::Time& time) {
     return fake_test_key_root_ + L"\\" +
            base::Int64ToString16(time.ToInternalValue());
   }
 
   void CreateManager(const base::Time& timestamp) {
     manager_.reset(new RegistryOverrideManager(timestamp, fake_test_key_root_));
     manager_->OverrideRegistry(HKEY_CURRENT_USER, L"override_manager_unittest");
   }
 
-  string16 fake_test_key_root_;
+  base::string16 fake_test_key_root_;
   scoped_ptr<RegistryOverrideManager> manager_;
 };
 
 TEST_F(RegistryOverrideManagerTest, Basic) {
   CreateManager(base::Time::Now());
 
   base::win::RegKey create_key;
   EXPECT_EQ(ERROR_SUCCESS,
             create_key.Create(HKEY_CURRENT_USER, kTestKeyPath, KEY_ALL_ACCESS));
   EXPECT_TRUE(create_key.Valid());
@@ skipping 13 matching lines @@
 
   manager_.reset();
 
   AssertKeyAbsent(kTestKeyPath);
 }
 
 TEST_F(RegistryOverrideManagerTest, DeleteStaleKeys) {
   base::Time::Exploded kTestTimeExploded = {2013, 11, 1, 4, 0, 0, 0, 0};
   base::Time kTestTime = base::Time::FromUTCExploded(kTestTimeExploded);
 
-  string16 path_garbage = fake_test_key_root_ + L"\\Blah";
-  string16 path_very_stale =
+  base::string16 path_garbage = fake_test_key_root_ + L"\\Blah";
+  base::string16 path_very_stale =
       FakeOverrideManagerPath(kTestTime - base::TimeDelta::FromDays(100));
-  string16 path_stale =
+  base::string16 path_stale =
       FakeOverrideManagerPath(kTestTime - base::TimeDelta::FromDays(5));
-  string16 path_current =
+  base::string16 path_current =
       FakeOverrideManagerPath(kTestTime - base::TimeDelta::FromMinutes(1));
-  string16 path_future =
+  base::string16 path_future =
       FakeOverrideManagerPath(kTestTime + base::TimeDelta::FromMinutes(1));
 
   CreateKey(path_garbage);
   CreateKey(path_very_stale);
   CreateKey(path_stale);
   CreateKey(path_current);
   CreateKey(path_future);
 
   CreateManager(kTestTime);
   manager_.reset();
 
   AssertKeyAbsent(path_garbage);
   AssertKeyAbsent(path_very_stale);
   AssertKeyAbsent(path_stale);
   AssertKeyExists(path_current);
   AssertKeyExists(path_future);
 }
 
 }  // namespace registry_util