Commit 3f3184d6 authored by fischman@chromium.org's avatar fischman@chromium.org

s/NOTREACHED/LOG(FATAL)/ to die even in release builds.

BUG=104579
TEST=built Debug & Release on desktop and verified test passes (after failing in Release on desktop before the change to RemoveFilter).


Review URL: http://codereview.chromium.org/8934002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114193 0039d316-1c4b-4281-b951-d872f2087c98
parent 0213480a
...@@ -82,7 +82,7 @@ void CompositeFilter::RemoveFilter(scoped_refptr<Filter> filter) { ...@@ -82,7 +82,7 @@ void CompositeFilter::RemoveFilter(scoped_refptr<Filter> filter) {
filter->clear_host(); filter->clear_host();
return; return;
} }
NOTREACHED() << "Filter missing."; LOG(FATAL) << "Filter missing.";
} }
void CompositeFilter::set_host(FilterHost* host) { void CompositeFilter::set_host(FilterHost* host) {
......
...@@ -396,8 +396,7 @@ TEST_F(CompositeFilterTest, TestAddRemoveFilter) { ...@@ -396,8 +396,7 @@ TEST_F(CompositeFilterTest, TestAddRemoveFilter) {
class CompositeFilterDeathTest : public CompositeFilterTest {}; class CompositeFilterDeathTest : public CompositeFilterTest {};
// Test failure of RemoveFilter() on an unknown filter. // Test failure of RemoveFilter() on an unknown filter.
// TODO(fischman): figure out why this is flaky. http://crbug.com/104579 TEST_F(CompositeFilterDeathTest, TestRemoveUnknownFilter) {
TEST_F(CompositeFilterDeathTest, DISABLED_TestRemoveUnknownFilter) {
composite_->set_host(mock_filter_host_.get()); composite_->set_host(mock_filter_host_.get());
// Remove unknown filter. // Remove unknown filter.
scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>(); scoped_refptr<StrictMock<MockFilter> > filter = new StrictMock<MockFilter>();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment