Add base:: to string16 in chrome_frame/.

chrome_frame/test_utils.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_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <shellapi.h>
 
@@ skipping 53 matching lines @@
 }
 
 // Registers or unregisters the DLL at |path| by calling out to the current
 // executable with --call-registration-entrypoint.  Loading the DLL into the
 // test process is problematic for component=shared_library builds since
 // singletons in base.dll aren't designed to handle multiple initialization.
 // Use of rundll32.exe is problematic since it does not return useful error
 // information.
 // static
 void ScopedChromeFrameRegistrar::DoRegistration(
-    const string16& path,
+    const base::string16& path,
     RegistrationType registration_type,
     RegistrationOperation registration_operation) {
   static const char* const kEntrypoints[] = {
     "DllRegisterServer",
     "DllUnregisterServer",
     "DllRegisterUserServer",
     "DllUnregisterUserServer",
   };
 
   DCHECK(!path.empty());
   DCHECK(registration_type == PER_USER || registration_type == SYSTEM_LEVEL);
   DCHECK(registration_operation == REGISTER ||
          registration_operation == UNREGISTER);
 
   int entrypoint_index = 0;
   base::LaunchOptions launch_options;
   base::win::ScopedHandle process_handle;
   int exit_code = -1;
 
   if (registration_type == PER_USER)
     entrypoint_index += 2;
   if (registration_operation == UNREGISTER)
     entrypoint_index += 1;
-  string16 registration_command(ASCIIToUTF16("\""));
+  base::string16 registration_command(ASCIIToUTF16("\""));
   registration_command +=
       CommandLine::ForCurrentProcess()->GetProgram().value();
   registration_command += ASCIIToUTF16("\" ");
   registration_command += kCallRegistrationEntrypointSwitch;
   registration_command += ASCIIToUTF16(" \"");
   registration_command += path;
   registration_command += ASCIIToUTF16("\" ");
   registration_command += ASCIIToUTF16(kEntrypoints[entrypoint_index]);
   launch_options.wait = true;
   if (!base::LaunchProcess(registration_command, launch_options,
@@ skipping 168 matching lines @@
       UOI_NAME,
       name,
       sizeof(name),
       &needed)) {
         is_locked = lstrcmpi(name, L"default") != 0;
     }
     ::CloseDesktop(input_desk);
   }
   return is_locked;
 }