diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:51:01 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:51:01 +0000 |
| commit | 3921d1954d9dfe490d179fe2c750bcab4980d533 (patch) | |
| tree | 37d27749acb449a9807b4b4c355edcaf19fa5f57 /chrome_frame/chrome_frame_npapi_unittest.cc | |
| parent | 21805a1bb44a59bfbb3ff1741b3efd2bc4e0667e (diff) | |
| download | chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.zip chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.tar.gz chromium_src-3921d1954d9dfe490d179fe2c750bcab4980d533.tar.bz2 | |
Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars are enabled.
Allow ChromeFrame to pass infobar enabled parameter to ExternalTabContainer.
BUG=2444936
Patch contributed by ericdingle@google.com
Original review at http://codereview.chromium.org/890005
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/1205001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_npapi_unittest.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi_unittest.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome_frame/chrome_frame_npapi_unittest.cc b/chrome_frame/chrome_frame_npapi_unittest.cc index 4d03b00..b30d5e8 100644 --- a/chrome_frame/chrome_frame_npapi_unittest.cc +++ b/chrome_frame/chrome_frame_npapi_unittest.cc @@ -20,7 +20,6 @@ namespace { using ::testing::_; using ::testing::Eq; -using ::testing::Field; using ::testing::Invoke; using ::testing::Return; using ::testing::StrEq; @@ -81,7 +80,9 @@ class MockNPAPI: public ChromeFrameNPAPI { class MockAutomationClient: public ChromeFrameAutomationClient { public: - MOCK_METHOD2(Initialize, bool(ChromeFrameDelegate*, ChromeFrameLaunchParams)); + MOCK_METHOD6(Initialize, bool(ChromeFrameDelegate*, int, bool, + const std::wstring&, const std::wstring&, + bool)); MOCK_METHOD1(SetEnableExtensionAutomation, void(const std::vector<std::string>&)); // NOLINT }; @@ -126,14 +127,7 @@ class TestNPAPIPrivilegedApi: public ::testing::Test { EXPECT_CALL(*mock_proxy, Initialize(_, _)).WillRepeatedly(Return(false)); EXPECT_CALL(*mock_automation, - Initialize(_, AllOf( - Field(&ChromeFrameLaunchParams::perform_version_check, true), - Field(&ChromeFrameLaunchParams::profile_name, - StrEq(profile_name)), - Field(&ChromeFrameLaunchParams::extra_chrome_arguments, - StrEq(extra_args)), - Field(&ChromeFrameLaunchParams::incognito_mode, is_incognito), - Field(&ChromeFrameLaunchParams::is_widget_mode, true)))) + Initialize(_, _, true, StrEq(profile_name), StrEq(extra_args), false)) .WillOnce(Return(true)); if (expect_privilege_check) { |