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

chrome_frame/test/chrome_frame_test_utils.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_TEST_CHROME_FRAME_TEST_UTILS_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 
 #include <windows.h>
 
 #include <atlbase.h>
 #include <atlwin.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "base/scoped_comptr_win.h"
 #include "base/win/registry.h"
+#include "base/win/scoped_comptr.h"
 
+#include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
-#include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/utils.h"
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include "gtest/gtest.h"
 
 // Needed for CreateFunctor.
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
@@ skipping 76 matching lines @@
     HRESULT hr = ref_instance->Initialize(timeout_seconds);
     if (FAILED(hr)) {
       LOG(ERROR) << "Failed to Initialize Hung COM call detector. Error:"
                  << hr;
       return NULL;
     }
     return this_instance;
   }
 
   void TearDown() {
-    ScopedComPtr<IMessageFilter> prev_filter;
+    base::win::ScopedComPtr<IMessageFilter> prev_filter;
     CoRegisterMessageFilter(prev_filter_.get(), prev_filter.Receive());
     DestroyWindow();
     m_hWnd = NULL;
   }
 
   STDMETHOD_(DWORD, HandleInComingCall)(DWORD call_type,
                                         HTASK caller,
                                         DWORD tick_count,
                                         LPINTERFACEINFO interface_info) {
     return SERVERCALL_ISHANDLED;
@@ skipping 43 matching lines @@
       return hr;
     }
 
     static const int kHungDetectTimerId = 0x0000baba;
     SetTimer(kHungDetectTimerId, 1000 * (timeout_seconds + 40), NULL);
     return S_OK;
   }
 
   // used to detect if outgoing COM calls hung.
   bool is_hung_;
-  ScopedComPtr<IMessageFilter> prev_filter_;
+  base::win::ScopedComPtr<IMessageFilter> prev_filter_;
 };
 
 // MessageLoopForUI wrapper that runs only for a limited time.
 // We need a UI message loop in the main thread.
 class TimedMsgLoop {
  public:
   TimedMsgLoop() : quit_loop_invoked_(false) {
   }
 
   void RunFor(int seconds) {
@@ skipping 139 matching lines @@
 }  // namespace chrome_frame_test
 
 // TODO(tommi): This is a temporary workaround while we're getting our
 // Singleton story straight.  Ideally each test should clear up any singletons
 // it might have created, but test cases do not implicitly have their own
 // AtExitManager, so we have this workaround method for tests that depend on
 // "fresh" singletons.  The implementation is in chrome_frame_unittest_main.cc.
 void DeleteAllSingletons();
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_