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

Unified Diff: chrome_frame/test/chrome_frame_activex_unittest.cc

Issue 6386025: Disabling building of CEEE; we will be moving the code to a separate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to head Created 9 years, 11 months 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/chrome_frame_activex_base.h ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/chrome_frame_activex_unittest.cc
diff --git a/chrome_frame/test/chrome_frame_activex_unittest.cc b/chrome_frame/test/chrome_frame_activex_unittest.cc
deleted file mode 100644
index 93f570f67e037eb421f8ffcd2fe2499161c6448a..0000000000000000000000000000000000000000
--- a/chrome_frame/test/chrome_frame_activex_unittest.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2010 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.
-//
-// Unit tests for ChromeFrameActivex.
-
-#include "chrome_frame/chrome_frame_activex.h"
-
-#include "ceee/common/initializing_coclass.h"
-#include "ceee/testing/utils/test_utils.h"
-#include "ceee/testing/utils/mock_com.h"
-#include "chrome_frame/test/chrome_tab_mocks.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-namespace {
-
-using testing::_;
-using testing::AddRef;
-using testing::DoAll;
-using testing::IOleClientSiteMockImpl;
-using testing::IServiceProviderMockImpl;
-using testing::MockIChromeFramePrivileged;
-using testing::Return;
-using testing::SetArgumentPointee;
-using testing::StrictMock;
-
-// Just to unhide the static function.
-class TestingChromeFrameActivex : public ChromeFrameActivex {
- public:
- static HRESULT TestingShouldShowVersionMismatchDialog(
- bool is_privileged, IOleClientSite* client_site) {
- return ShouldShowVersionMismatchDialog(is_privileged, client_site);
- }
-};
-
-class MockChromeFrameClientSite
- : public CComObjectRootEx<CComSingleThreadModel>,
- public StrictMock<IOleClientSiteMockImpl>,
- public StrictMock<IServiceProviderMockImpl> {
- public:
- DECLARE_NOT_AGGREGATABLE(MockChromeFrameClientSite)
- BEGIN_COM_MAP(MockChromeFrameClientSite)
- COM_INTERFACE_ENTRY(IOleClientSite)
- COM_INTERFACE_ENTRY(IServiceProvider)
- END_COM_MAP()
- DECLARE_PROTECT_FINAL_CONSTRUCT()
-
- HRESULT Initialize(MockChromeFrameClientSite** client_site) {
- *client_site = this;
- return S_OK;
- }
-};
-
-TEST(ChromeFrameActivex, ShouldShowVersionMismatchDialog) {
- // If not privileged, we always show the dialog.
- ASSERT_TRUE(
- TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(
- false, NULL));
-
- MockChromeFrameClientSite* cs_keeper;
- ScopedComPtr<IOleClientSite> cs;
- ASSERT_HRESULT_SUCCEEDED(
- InitializingCoClass<MockChromeFrameClientSite>::CreateInitialized(
- &cs_keeper, cs.Receive()));
-
- MockIChromeFramePrivileged* cfp_keeper;
- ScopedComPtr<IChromeFramePrivileged> cfp;
- ASSERT_HRESULT_SUCCEEDED(
- InitializingCoClass<MockIChromeFramePrivileged>::CreateInitialized(
- &cfp_keeper, cfp.Receive()));
-
- EXPECT_CALL(*cs_keeper, QueryService(SID_ChromeFramePrivileged,
- IID_IChromeFramePrivileged, _))
- .WillRepeatedly(DoAll(AddRef(cfp.get()),
- SetArgumentPointee<2>(static_cast<void*>(cfp)),
- Return(S_OK)));
-
- EXPECT_CALL(*cfp_keeper, ShouldShowVersionMismatchDialog())
- .WillOnce(Return(S_OK));
- ASSERT_TRUE(
- TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(
- true, cs_keeper));
-
- EXPECT_CALL(*cfp_keeper, ShouldShowVersionMismatchDialog())
- .WillOnce(Return(S_FALSE));
- ASSERT_FALSE(
- TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(
- true, cs_keeper));
-
- // Also test that we fail safe, showing the dialog unless we got
- // an affirmative do-not-show.
- EXPECT_CALL(*cfp_keeper, ShouldShowVersionMismatchDialog())
- .WillOnce(Return(E_UNEXPECTED));
- ASSERT_TRUE(
- TestingChromeFrameActivex::TestingShouldShowVersionMismatchDialog(
- true, cs_keeper));
-}
-
-} // namespace
« no previous file with comments | « chrome_frame/chrome_frame_activex_base.h ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698