Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome_frame/test/chrome_frame_test_utils.cc

 // Copyright (c) 2011 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/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome_frame/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 namespace chrome_frame_test {
 
 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
 
 const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA |
@@ skipping 198 matching lines @@
 base::ProcessHandle LaunchIE(const std::wstring& url) {
   if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     return LaunchIEOnVista(url);
   }
   return LaunchExecutable(kIEImageName, url);
 }
 
 int CloseAllIEWindows() {
   int ret = 0;
 
-  ScopedComPtr<IShellWindows> windows;
+  base::win::ScopedComPtr<IShellWindows> windows;
   HRESULT hr = ::CoCreateInstance(__uuidof(ShellWindows), NULL, CLSCTX_ALL,
       IID_IShellWindows, reinterpret_cast<void**>(windows.Receive()));
   DCHECK(SUCCEEDED(hr));
 
   if (SUCCEEDED(hr)) {
     long count = 0;  // NOLINT
     windows->get_Count(&count);
     VARIANT i = { VT_I4 };
     for (i.lVal = 0; i.lVal < count; ++i.lVal) {
-      ScopedComPtr<IDispatch> folder;
+      base::win::ScopedComPtr<IDispatch> folder;
       windows->Item(i, folder.Receive());
       if (folder != NULL) {
-        ScopedComPtr<IWebBrowser2> browser;
+        base::win::ScopedComPtr<IWebBrowser2> browser;
         if (SUCCEEDED(browser.QueryFrom(folder))) {
           bool is_ie = true;
           HWND window = NULL;
           // Check the class of the browser window to make sure we only close
           // IE windows.
           if (browser->get_HWND(reinterpret_cast<SHANDLE_PTR*>(window))) {
             wchar_t class_name[MAX_PATH];
             if (::GetClassName(window, class_name, arraysize(class_name))) {
               is_ie = _wcsicmp(class_name, L"IEFrame") == 0;
             }
@@ skipping 107 matching lines @@
   DWORD cocreate_flags = CLSCTX_LOCAL_SERVER;
   chrome_frame_test::LowIntegrityToken token;
   // Vista has a bug which manifests itself when a medium integrity process
   // launches a COM server like IE which runs in protected mode due to UAC.
   // This causes the IWebBrowser2 interface which is returned to be useless,
   // i.e it does not receive any events, etc. Our workaround for this is
   // to impersonate a low integrity token and then launch IE.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
     // Create medium integrity browser that will launch IE broker.
-    ScopedComPtr<IWebBrowser2> medium_integrity_browser;
+    base::win::ScopedComPtr<IWebBrowser2> medium_integrity_browser;
     hr = medium_integrity_browser.CreateInstance(CLSID_InternetExplorer, NULL,
                                                  CLSCTX_LOCAL_SERVER);
     if (FAILED(hr))
       return hr;
     medium_integrity_browser->Quit();
     // Broker remains alive.
     if (!token.Impersonate()) {
       hr = HRESULT_FROM_WIN32(GetLastError());
       return hr;
     }
@@ skipping 278 matching lines @@
 
 ScopedChromeFrameRegistrar::RegistrationType GetTestBedType() {
   if (GetConfigBool(false, L"PerUserTestBed")) {
     return ScopedChromeFrameRegistrar::PER_USER;
   } else {
     return ScopedChromeFrameRegistrar::SYSTEM_LEVEL;
   }
 }
 
 }  // namespace chrome_frame_test