diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-04 00:47:21 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-04 00:47:21 +0000 |
| commit | b11a51dd7ef6b95100b903841c2e742265b9ef4d (patch) | |
| tree | 232bcafeeba611aaccabb485e4140b23b227f036 /chrome_frame/test/ui_test.cc | |
| parent | d0977c01ffa5e733a828977a8aa30def295d700f (diff) | |
| download | chromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.zip chromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.tar.gz chromium_src-b11a51dd7ef6b95100b903841c2e742265b9ef4d.tar.bz2 | |
base: Remove stub scoped_variant_win.h file.
Fix the callers and add base::win in the call sites.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/5507001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/ui_test.cc')
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index adc00ef..1690e01 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -269,7 +269,7 @@ TEST_P(FullTabUITest, ViewSource) { InSequence expect_in_sequence_for_scope; // After navigation invoke view soruce action using IWebBrowser2::ExecWB - VARIANT empty = ScopedVariant::kEmptyVariant; + VARIANT empty = base::win::ScopedVariant::kEmptyVariant; EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetSimplePageUrl()))) .WillOnce(DelayExecCommand(&ie_mock_, &loop_, 0, &CGID_MSHTML, @@ -309,7 +309,7 @@ void NavigateToCurrentUrl(MockIEEventSink* mock) { EXPECT_HRESULT_SUCCEEDED(hr); if (SUCCEEDED(hr)) { DCHECK(bstr.Length()); - VARIANT empty = ScopedVariant::kEmptyVariant; + VARIANT empty = base::win::ScopedVariant::kEmptyVariant; hr = browser->Navigate(bstr, &empty, &empty, &empty, &empty); EXPECT_HRESULT_SUCCEEDED(hr); } @@ -365,7 +365,7 @@ TEST_P(FullTabUITest, TabCrashRefresh) { ConnectDocPropNotifySink(&ie_mock_, &prop_listener), KillChromeFrameProcesses())); - VARIANT empty = ScopedVariant::kEmptyVariant; + VARIANT empty = base::win::ScopedVariant::kEmptyVariant; EXPECT_CALL(prop_listener, OnChanged(/*DISPID_READYSTATE*/_)) .WillOnce(DoAll( DisconnectDocPropNotifySink(&prop_listener), |