Update some uses of char16 to use the base:: namespace.

components/policy/core/common/policy_loader_win_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 "components/policy/core/common/policy_loader_win.h"
 
 #include <windows.h>
 #include <userenv.h>
 
 #include <algorithm>
@@ skipping 585 matching lines @@
                                             DWORD value) {
   value = base::ByteSwapToLE32(value);
   AppendRecordToPRegFile(path, key, REG_DWORD, sizeof(DWORD),
                          reinterpret_cast<uint8*>(&value));
 }
 
 void PRegTestHarness::AppendStringToPRegFile(const base::string16& path,
                                              const std::string& key,
                                              const std::string& value) {
   base::string16 string16_value(UTF8ToUTF16(value));
-  std::vector<char16> data;
+  std::vector<base::char16> data;
   std::transform(string16_value.begin(), string16_value.end(),
                  std::back_inserter(data), std::ptr_fun(base::ByteSwapToLE16));
   data.push_back(base::ByteSwapToLE16(L'\0'));
 
-  AppendRecordToPRegFile(path, key, REG_SZ, data.size() * sizeof(char16),
+  AppendRecordToPRegFile(path, key, REG_SZ, data.size() * sizeof(base::char16),
                          reinterpret_cast<uint8*>(vector_as_array(&data)));
 }
 
 void PRegTestHarness::AppendPolicyToPRegFile(const base::string16& path,
                                              const std::string& key,
                                              const base::Value* value) {
   switch (value->GetType()) {
     case base::Value::TYPE_BOOLEAN: {
       bool boolean_value = false;
       ASSERT_TRUE(value->GetAsBoolean(&boolean_value));
@@ skipping 64 matching lines @@
     testing::Values(RegistryTestHarness::CreateHKCU,
                     RegistryTestHarness::CreateHKLM,
                     PRegTestHarness::Create));
 
 // Test cases for windows policy provider specific functionality.
 class PolicyLoaderWinTest : public PolicyTestBase,
                             public AppliedGPOListProvider {
  protected:
   // The policy key this tests places data under. This must match the data
   // files in chrome/test/data/policy/gpo.
-  static const char16 kTestPolicyKey[];
+  static const base::char16 kTestPolicyKey[];
 
   PolicyLoaderWinTest()
       : gpo_list_(NULL),
         gpo_list_status_(ERROR_ACCESS_DENIED) {}
   virtual ~PolicyLoaderWinTest() {}
 
   virtual void SetUp() OVERRIDE {
     PolicyTestBase::SetUp();
 
     ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir_));
@@ skipping 68 matching lines @@
                   POLICY_SCOPE_MACHINE);
     return Matches(expected);
   }
 
   ScopedGroupPolicyRegistrySandbox registry_sandbox_;
   PGROUP_POLICY_OBJECT gpo_list_;
   DWORD gpo_list_status_;
   base::FilePath test_data_dir_;
 };
 
-const char16 PolicyLoaderWinTest::kTestPolicyKey[] =
+const base::char16 PolicyLoaderWinTest::kTestPolicyKey[] =
     L"SOFTWARE\\Policies\\Chromium";
 
 TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) {
   RegKey hklm_key(HKEY_LOCAL_MACHINE, kTestPolicyKey, KEY_ALL_ACCESS);
   ASSERT_TRUE(hklm_key.Valid());
   hklm_key.WriteValue(UTF8ToUTF16(test_keys::kKeyString).c_str(),
                       UTF8ToUTF16("hklm").c_str());
   RegKey hkcu_key(HKEY_CURRENT_USER, kTestPolicyKey, KEY_ALL_ACCESS);
   ASSERT_TRUE(hkcu_key.Valid());
   hkcu_key.WriteValue(UTF8ToUTF16(test_keys::kKeyString).c_str(),
@@ skipping 383 matching lines @@
   PolicyMap& expected_policy = expected.Get(ns);
   expected_policy.Set("alternative_browser_path",
                       POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
                       new base::StringValue("c:\\legacy\\browser.exe"), NULL);
   expected_policy.Set("url_list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
                       list.DeepCopy(), NULL);
   EXPECT_TRUE(Matches(expected));
 }
 
 }  // namespace policy