Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6557)

Unified Diff: chrome_frame/test/ui_test.cc

Issue 5507001: base: Remove stub scoped_variant_win.h file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/mock_ie_event_sink_test.cc ('k') | chrome_frame/utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/ui_test.cc
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index adc00efc517ba1581824922aae50562b819da3cb..1690e01328c95ca82cae9269c04bba1b564bdc9e 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),
« no previous file with comments | « chrome_frame/test/mock_ie_event_sink_test.cc ('k') | chrome_frame/utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698