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

chrome_frame/chrome_frame_automation.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
+#include <map>
 #include <string>
-#include <map>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_handle.h"
 #include "base/stack_container.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
 #include "chrome/test/automation/automation_proxy.h"
@@ skipping 499 matching lines @@
   // Only used if we attach to an existing tab.
   uint64 external_tab_cookie_;
 
   // Set to true if we received a navigation request prior to the automation
   // server being initialized.
   bool navigate_after_initialization_;
 
   scoped_refptr<ChromeFrameLaunchParams> chrome_launch_params_;
 
   // Cache security manager for URL zone checking
-  ScopedComPtr<IInternetSecurityManager> security_manager_;
+  base::win::ScopedComPtr<IInternetSecurityManager> security_manager_;
 
   // When host network stack is used, this object is in charge of
   // handling network requests.
   PluginUrlRequestManager* url_fetcher_;
   PluginUrlRequestManager::ThreadSafeFlags url_fetcher_flags_;
 
   // set to true if the host needs to get notified of all top level navigations
   // in this page. This typically applies to hosts which would render the new
   // page without chrome frame. Defaults to false.
   bool route_all_top_level_navigations_;
 
   friend class BeginNavigateContext;
   friend class CreateExternalTabContext;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_