Add base:: to string16 in chrome_frame/.

chrome_frame/test/ie_configurator.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/test/ie_configurator.h"
 
 #include <windows.h>
 #include <objbase.h>
 
 #include <ios>
@@ skipping 166 matching lines @@
     // This 8-byte binary value is the FILETIME of run-once deferral.
     const wchar_t* last_shown_timestamp;
   };
 
   static const RunOnceValueNames kIE8ValueNames;
   static const RunOnceValueNames kIE9ValueNames;
   static const RunOnceValueNames kIE10ValueNames;
 
   static const RunOnceValueNames* RunOnceNamesForVersion(IEVersion ie_version);
   bool IsPerUserSetupComplete();
-  static string16 GetChromeFrameBHOCLSID();
+  static base::string16 GetChromeFrameBHOCLSID();
   static bool IsAddonPromptDisabledForChromeFrame();
 
   const IEVersion ie_version_;
   const RunOnceValueNames* run_once_value_names_;
   RegistrySetter setter_;
 
   DISALLOW_COPY_AND_ASSIGN(ModernIEConfigurator);
 };
 
 // RegistrySetter implementation.
@@ skipping 257 matching lines @@
   base::Time time_shown = base::Time::FromFileTime(shown_time);
   base::Time time_completed = base::Time::FromFileTime(completion_time);
   if (time_shown >= time_completed)
     return false;
 
   return true;
 }
 
 // Returns the path to the IE9 Approved Extensions key for Chrome Frame.
 // static
-string16 ModernIEConfigurator::GetChromeFrameBHOCLSID() {
-  string16 bho_guid(39, L'\0');
+base::string16 ModernIEConfigurator::GetChromeFrameBHOCLSID() {
+  base::string16 bho_guid(39, L'\0');
   int guid_len = StringFromGUID2(CLSID_ChromeFrameBHO, &bho_guid[0],
                                  bho_guid.size());
   DCHECK_EQ(guid_len, static_cast<int>(bho_guid.size()));
   bho_guid.resize(guid_len - 1);
   return bho_guid;
 }
 
 // Returns true if the add-on enablement prompt is disabled by Group Policy.
 // static
 bool ModernIEConfigurator::IsAddonPromptDisabledForChromeFrame() {
@@ skipping 112 matching lines @@
 void InstallIEConfigurator() {
   IEConfigurator* configurator = CreateConfigurator();
 
   if (configurator != NULL) {
     testing::UnitTest::GetInstance()->listeners().Append(
         new ConfiguratorDriver(configurator));
   }
 }
 
 }  // namespace chrome_frame_test