From 8ee65baac4ab9e3beb67674adbc6a210e2708604 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 12 Apr 2011 20:53:23 +0000 Subject: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. Fix up all the callers to use the new location and namespace. Also, delete the stub file since it isn't included by anyone more. (Note: This was a TODO for brettw). BUG=None TEST=None R=brettw@chromium.org Review URL: http://codereview.chromium.org/6825055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/test/chrome_frame_test_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome_frame/test/chrome_frame_test_utils.h') diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 781ba7f..3a44d04 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -17,11 +17,11 @@ #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_utils.h" #include "chrome_frame/test/simulate_input.h" +#include "chrome_frame/test_utils.h" #include "chrome_frame/utils.h" // Include without path to make GYP build see it. @@ -118,7 +118,7 @@ class HungCOMCallDetector } void TearDown() { - ScopedComPtr prev_filter; + base::win::ScopedComPtr prev_filter; CoRegisterMessageFilter(prev_filter_.get(), prev_filter.Receive()); DestroyWindow(); m_hWnd = NULL; @@ -182,7 +182,7 @@ class HungCOMCallDetector // used to detect if outgoing COM calls hung. bool is_hung_; - ScopedComPtr prev_filter_; + base::win::ScopedComPtr prev_filter_; }; // MessageLoopForUI wrapper that runs only for a limited time. -- cgit v1.1