diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome_frame/test/mock_ie_event_sink_test.cc | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/test/mock_ie_event_sink_test.cc')
| -rw-r--r-- | chrome_frame/test/mock_ie_event_sink_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc index 99ccfc4..8eddc4c 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.cc +++ b/chrome_frame/test/mock_ie_event_sink_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -6,8 +6,8 @@ #include <sstream> -#include "base/win/scoped_variant.h" #include "base/utf_string_conversions.h" +#include "base/win/scoped_variant.h" #include "chrome_frame/test/mock_ie_event_sink_actions.h" // Needed for CreateFunctor. @@ -157,10 +157,10 @@ void MockIEEventSink::ExpectAnyNavigations() { } void MockIEEventSink::ExpectDocumentReadystate(int ready_state) { - ScopedComPtr<IWebBrowser2> browser(event_sink_->web_browser2()); + base::win::ScopedComPtr<IWebBrowser2> browser(event_sink_->web_browser2()); EXPECT_TRUE(browser != NULL); if (browser) { - ScopedComPtr<IDispatch> document; + base::win::ScopedComPtr<IDispatch> document; browser->get_Document(document.Receive()); EXPECT_TRUE(document != NULL); if (document) { |