diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 06:29:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 06:29:09 +0000 |
| commit | b9e8ea61b8b7b897292bfc69814444dd9e938477 (patch) | |
| tree | ea43dd2f83e6d4f336c6986e7b09e151b63c312e /chrome/common/extensions/extension_localization_peer_unittest.cc | |
| parent | 8e9f4a3ae2f3d584a57a1197d42ac4d22f0b98ac (diff) | |
| download | chromium_src-b9e8ea61b8b7b897292bfc69814444dd9e938477.zip chromium_src-b9e8ea61b8b7b897292bfc69814444dd9e938477.tar.gz chromium_src-b9e8ea61b8b7b897292bfc69814444dd9e938477.tar.bz2 | |
Take out the is_content_filtered bool that gets passed around betwen renderer/browser and WebKit, since it's not used anywhere.
Review URL: http://codereview.chromium.org/6621006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_localization_peer_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/extension_localization_peer_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/common/extensions/extension_localization_peer_unittest.cc b/chrome/common/extensions/extension_localization_peer_unittest.cc index 87cea6b..a0205d5 100644 --- a/chrome/common/extensions/extension_localization_peer_unittest.cc +++ b/chrome/common/extensions/extension_localization_peer_unittest.cc @@ -63,9 +63,8 @@ class MockResourceLoaderBridgePeer const webkit_glue::ResourceResponseInfo& info, bool* has_new_first_party_for_cookies, GURL* new_first_party_for_cookies)); - MOCK_METHOD2(OnReceivedResponse, void( - const webkit_glue::ResourceResponseInfo& info, - bool content_filtered)); + MOCK_METHOD1(OnReceivedResponse, void( + const webkit_glue::ResourceResponseInfo& info)); MOCK_METHOD1(OnDownloadedData, void(int len)); MOCK_METHOD2(OnReceivedData, void(const char* data, int len)); MOCK_METHOD3(OnCompletedRequest, void( @@ -139,7 +138,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) { // It will self-delete once it exits OnCompletedRequest. ExtensionLocalizationPeer* filter_peer = filter_peer_.release(); - EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)); + EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); EXPECT_CALL(*original_peer_, OnCompletedRequest( IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::Time())); @@ -155,7 +154,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) { EXPECT_CALL(*original_peer_, OnReceivedData(_, _)).Times(0); EXPECT_CALL(*sender_, Send(_)).Times(0); - EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)); + EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); EXPECT_CALL(*original_peer_, OnCompletedRequest( IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time())); @@ -176,7 +175,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) { EXPECT_CALL(*original_peer_, OnReceivedData(StrEq(data.data()), data.length())).Times(2); - EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)).Times(2); + EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(2); EXPECT_CALL(*original_peer_, OnCompletedRequest( IsURLRequestEqual( net::URLRequestStatus::SUCCESS), "", base::Time())).Times(2); @@ -214,7 +213,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) { EXPECT_CALL(*original_peer_, OnReceivedData(StrEq(data.data()), data.length())); - EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)); + EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); EXPECT_CALL(*original_peer_, OnCompletedRequest( IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time())); @@ -244,7 +243,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) { EXPECT_CALL(*original_peer_, OnReceivedData(StrEq(message.data()), message.length())); - EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)); + EXPECT_CALL(*original_peer_, OnReceivedResponse(_)); EXPECT_CALL(*original_peer_, OnCompletedRequest( IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time())); |