Index: components/data_reduction_proxy/content/browser/data_reduction_proxy_host_impl_unittest.cc |
diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_message_filter_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_host_impl_unittest.cc |
similarity index 69% |
rename from components/data_reduction_proxy/content/browser/data_reduction_proxy_message_filter_unittest.cc |
rename to components/data_reduction_proxy/content/browser/data_reduction_proxy_host_impl_unittest.cc |
index 1c89e99d4d37562ac3791b681ed281355b2c95f5..4ed2cd5ddc25ab34609eb24dd5c05003c52a83fe 100644 |
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_message_filter_unittest.cc |
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_host_impl_unittest.cc |
@@ -2,12 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_message_filter.h" |
+#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_host_impl.h" |
#include <memory> |
+#include "base/bind.h" |
#include "base/command_line.h" |
-#include "base/memory/ref_counted.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_config_test_utils.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test_utils.h" |
@@ -19,7 +19,15 @@ |
namespace data_reduction_proxy { |
-class DataReductionProxyMessageFilterTest : public testing::Test { |
+namespace { |
+ |
+void GetResultCallback(bool* holder, bool is_data_reduction_proxy) { |
+ *holder = is_data_reduction_proxy; |
+} |
+ |
+} // namespace |
+ |
+class DataReductionProxyHostImplTest : public testing::Test { |
public: |
void SetUp() override { |
test_context_ = |
@@ -28,14 +36,13 @@ class DataReductionProxyMessageFilterTest : public testing::Test { |
.WithParamsDefinitions(TestDataReductionProxyParams::HAS_EVERYTHING) |
.WithMockConfig() |
.Build(); |
- message_filter_ = new DataReductionProxyMessageFilter( |
- test_context_->settings()); |
+ DataReductionProxySettings* settings = test_context_->settings(); |
+ host_.reset(new DataReductionProxyHostImpl(settings->Config()->GetWeakPtr(), |
+ nullptr)); |
} |
protected: |
- DataReductionProxyMessageFilter* message_filter() const { |
- return message_filter_.get(); |
- } |
+ DataReductionProxyHostImpl* host() const { return host_.get(); } |
MockDataReductionProxyConfig* config() const { |
return test_context_->mock_config(); |
@@ -44,25 +51,25 @@ class DataReductionProxyMessageFilterTest : public testing::Test { |
private: |
base::MessageLoopForIO message_loop_; |
std::unique_ptr<DataReductionProxyTestContext> test_context_; |
- scoped_refptr<DataReductionProxyMessageFilter> message_filter_; |
+ std::unique_ptr<DataReductionProxyHostImpl> host_; |
}; |
-TEST_F(DataReductionProxyMessageFilterTest, TestOnIsDataReductionProxy) { |
+TEST_F(DataReductionProxyHostImplTest, TestIsDataReductionProxy) { |
net::HostPortPair proxy_server = |
net::HostPortPair::FromString("www.google.com:443"); |
bool is_data_reduction_proxy = false; |
EXPECT_CALL(*config(), IsDataReductionProxy(testing::_, nullptr)) |
.Times(1) |
.WillOnce(testing::Return(true)); |
- message_filter()->OnIsDataReductionProxy(proxy_server, |
- &is_data_reduction_proxy); |
+ host()->IsDataReductionProxy( |
+ proxy_server, base::Bind(&GetResultCallback, &is_data_reduction_proxy)); |
EXPECT_TRUE(is_data_reduction_proxy); |
EXPECT_CALL(*config(), IsDataReductionProxy(testing::_, nullptr)) |
.Times(1) |
.WillOnce(testing::Return(false)); |
- message_filter()->OnIsDataReductionProxy(proxy_server, |
- &is_data_reduction_proxy); |
+ host()->IsDataReductionProxy( |
+ proxy_server, base::Bind(&GetResultCallback, &is_data_reduction_proxy)); |
EXPECT_FALSE(is_data_reduction_proxy); |
} |