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

chrome_frame/test/net/fake_external_tab.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/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
 #include "app/app_paths.h"
 #include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/chrome_content_browser_client.h"
-#include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test/win_event_receiver.h"
 #include "chrome_frame/utils.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/content_client.h"
 #include "content/common/content_paths.h"
 #include "content/common/notification_service.h"
@@ skipping 35 matching lines @@
 
 // Uses the IAccessible interface for the window to set the focus.
 // This can be useful when you don't have control over the thread that
 // owns the window.
 // NOTE: this depends on oleacc.lib which the net tests already depend on
 // but other unit tests don't depend on oleacc so we can't just add the method
 // directly into chrome_frame_test_utils.cc (without adding a
 // #pragma comment(lib, "oleacc.lib")).
 bool SetFocusToAccessibleWindow(HWND hwnd) {
   bool ret = false;
-  ScopedComPtr<IAccessible> acc;
+  base::win::ScopedComPtr<IAccessible> acc;
   AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, IID_IAccessible,
       reinterpret_cast<void**>(acc.Receive()));
   if (acc) {
     VARIANT self = { VT_I4 };
     self.lVal = CHILDID_SELF;
     ret = SUCCEEDED(acc->accSelect(SELFLAG_TAKEFOCUS, self));
   }
   return ret;
 }
 
@@ skipping 406 matching lines @@
 
   WindowWatchdog watchdog;
   // See url_request_unittest.cc for these credentials.
   SupplyProxyCredentials credentials("user", "secret");
   watchdog.AddObserver(&credentials, "Windows Security", "");
   testing::InitGoogleTest(&argc, argv);
   FilterDisabledTests();
   test_suite.RunMainUIThread();
   return 0;
 }