Add base:: to string16 in chrome_frame/.

chrome_frame/policy_settings.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 "chrome_frame/policy_settings.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 95 matching lines @@
 
 // static
 void PolicySettings::ReadMetadataCheckSettings(
     SkipMetadataCheck* skip_metadata_check) {
   DCHECK(skip_metadata_check);
 
   *skip_metadata_check = SKIP_METADATA_CHECK_NOT_SPECIFIED;
 
   base::win::RegKey config_key;
   DWORD value = SKIP_METADATA_CHECK_NOT_SPECIFIED;
-  string16 settings_value(
-      ASCIIToWide(policy::key::kSkipMetadataCheck));
+  base::string16 settings_value(ASCIIToWide(policy::key::kSkipMetadataCheck));
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
     if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
                          KEY_READ) == ERROR_SUCCESS) &&
         (config_key.ReadValueDW(settings_value.c_str(),
                                 &value) == ERROR_SUCCESS)) {
       break;
     }
   }
 
   DCHECK(value == SKIP_METADATA_CHECK_NOT_SPECIFIED ||
@@ skipping 40 matching lines @@
                               value) == ERROR_SUCCESS)) {
       break;
     }
   }
 }
 
 // static
 void PolicySettings::ReadBoolSetting(const char* value_name, bool* value) {
   DCHECK(value);
   base::win::RegKey config_key;
-  string16 value_name_str(ASCIIToWide(value_name));
+  base::string16 value_name_str(ASCIIToWide(value_name));
   DWORD dword_value = 0;
   for (int i = 0; i < arraysize(kRootKeys); ++i) {
     if ((config_key.Open(kRootKeys[i], policy::kRegistryChromePolicyKey,
                          KEY_QUERY_VALUE) == ERROR_SUCCESS) &&
         (config_key.ReadValueDW(value_name_str.c_str(),
                                 &dword_value) == ERROR_SUCCESS)) {
       *value = (dword_value != 0);
       break;
     }
   }
@@ skipping 33 matching lines @@
   swap(content_type_list_, content_type_list);
   swap(application_locale_, application_locale);
   swap(additional_launch_parameters_, additional_launch_parameters);
   swap(suppress_turndown_prompt_, suppress_turndown_prompt);
 }
 
 // static
 PolicySettings* PolicySettings::GetInstance() {
   return Singleton<PolicySettings>::get();
 }