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

chrome_frame/chrome_active_document.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_ACTIVE_DOCUMENT_H_
 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
 #include <htiframe.h>
 #include <mshtmcid.h>
 #include <perhist.h>
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/scoped_comptr_win.h"
 #include "base/threading/thread.h"
+#include "base/win/scoped_comptr.h"
 
 #include "chrome_frame/chrome_frame_activex_base.h"
 #include "chrome_frame/com_type_info_holder.h"
+#include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/find_dialog.h"
 #include "chrome_frame/html_private_window_impl.h"
 #include "chrome_frame/html_window_impl.h"
 #include "chrome_frame/in_place_menu.h"
 #include "chrome_frame/ole_document_impl.h"
 #include "chrome_frame/resource.h"
-#include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/utils.h"
 
 class Thread;
 class TabProxy;
 class ChromeActiveDocument;
 
 // A call to IOleCommandTarget::Exec on the webbrowser with this command id
 // and a command group of CGID_EXPLORER causes IE to finalize the current
 // travel log entry and move to a new location (pruning any forward entries
 // if needed)
@@ skipping 419 matching lines @@
   CommandStatusMap null_group_commands_map_;
   CommandStatusMap mshtml_group_commands_map_;
   CommandStatusMap explorer_group_commands_map_;
   CommandStatusMap shdoc_view_group_commands_map_;
 
   // Set to true if the automation_client_ member is initialized from
   // an existing ChromeActiveDocument instance which is going away and
   // a new ChromeActiveDocument instance is taking its place.
   bool is_automation_client_reused_;
 
-  ScopedComPtr<INewWindowManager> popup_manager_;
+  base::win::ScopedComPtr<INewWindowManager> popup_manager_;
   bool popup_allowed_;
   HACCEL accelerator_table_;
 
   // Contains privacy data retrieved from the UrlmonUrlRequestManager. This
   // is used to return privacy data in response to the View->Privacy policy
   // command.
   UrlmonUrlRequestManager::PrivacyInfo privacy_info_;
   UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
       next_privacy_record_;
 
  public:
   OLEINPLACEFRAMEINFO frame_info_;
 };
 
 #endif  // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_