Index: components/previews/core/previews_io_data_unittest.cc |
diff --git a/components/previews/core/previews_io_data_unittest.cc b/components/previews/core/previews_io_data_unittest.cc |
index 3bc50828c5906b6bee8cce0238cf2b770d8fa5f2..7021a5a2663c543c0744a83993d022cf388ee64e 100644 |
--- a/components/previews/core/previews_io_data_unittest.cc |
+++ b/components/previews/core/previews_io_data_unittest.cc |
@@ -4,33 +4,15 @@ |
#include "components/previews/core/previews_io_data.h" |
-#include <map> |
#include <memory> |
-#include <string> |
-#include "base/bind.h" |
-#include "base/bind_helpers.h" |
-#include "base/callback.h" |
#include "base/memory/ptr_util.h" |
#include "base/memory/ref_counted.h" |
#include "base/message_loop/message_loop.h" |
-#include "base/metrics/field_trial.h" |
#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
-#include "base/test/histogram_tester.h" |
-#include "base/threading/thread_task_runner_handle.h" |
-#include "base/time/time.h" |
-#include "components/previews/core/previews_black_list.h" |
-#include "components/previews/core/previews_black_list_item.h" |
-#include "components/previews/core/previews_opt_out_store.h" |
#include "components/previews/core/previews_ui_service.h" |
-#include "components/variations/variations_associated_data.h" |
-#include "net/nqe/effective_connection_type.h" |
-#include "net/nqe/network_quality_estimator_test_util.h" |
-#include "net/url_request/url_request.h" |
-#include "net/url_request/url_request_test_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "url/gurl.h" |
namespace previews { |
@@ -59,40 +41,6 @@ class TestPreviewsIOData : public PreviewsIOData { |
bool initialized_; |
}; |
-void RunLoadCallback( |
- LoadBlackListCallback callback, |
- std::unique_ptr<BlackListItemMap> black_list_item_map, |
- std::unique_ptr<PreviewsBlackListItem> host_indifferent_black_list_item) { |
- callback.Run(std::move(black_list_item_map), |
- std::move(host_indifferent_black_list_item)); |
-} |
- |
-class TestPreviewsOptOutStore : public PreviewsOptOutStore { |
- public: |
- TestPreviewsOptOutStore() {} |
- ~TestPreviewsOptOutStore() override {} |
- |
- private: |
- // PreviewsOptOutStore implementation: |
- void AddPreviewNavigation(bool opt_out, |
- const std::string& host_name, |
- PreviewsType type, |
- base::Time now) override {} |
- |
- void LoadBlackList(LoadBlackListCallback callback) override { |
- std::unique_ptr<BlackListItemMap> black_list_item_map( |
- new BlackListItemMap()); |
- std::unique_ptr<PreviewsBlackListItem> host_indifferent_black_list_item = |
- PreviewsBlackList::CreateHostIndifferentBlackListItem(); |
- base::ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, base::Bind(&RunLoadCallback, callback, |
- base::Passed(&black_list_item_map), |
- base::Passed(&host_indifferent_black_list_item))); |
- } |
- |
- void ClearBlackList(base::Time begin_time, base::Time end_time) override {} |
-}; |
- |
class PreviewsIODataTest : public testing::Test { |
public: |
PreviewsIODataTest() {} |
@@ -121,104 +69,14 @@ class PreviewsIODataTest : public testing::Test { |
} // namespace |
TEST_F(PreviewsIODataTest, TestInitialization) { |
- set_io_data(base::MakeUnique<TestPreviewsIOData>(loop_.task_runner(), |
- loop_.task_runner())); |
- set_ui_service(base::MakeUnique<PreviewsUIService>( |
- io_data(), loop_.task_runner(), nullptr)); |
+ set_io_data(base::WrapUnique( |
+ new TestPreviewsIOData(loop_.task_runner(), loop_.task_runner()))); |
+ set_ui_service(base::WrapUnique( |
+ new PreviewsUIService(io_data(), loop_.task_runner(), nullptr))); |
base::RunLoop().RunUntilIdle(); |
// After the outstanding posted tasks have run, |io_data_| should be fully |
// initialized. |
EXPECT_TRUE(io_data()->initialized()); |
} |
-TEST_F(PreviewsIODataTest, TestShouldAllowPreview) { |
- // Test most reasons to disallow the blacklist. |
- // Excluded values are USER_RECENTLY_OPTED_OUT, USER_BLACKLISTED, |
- // HOST_BLACKLISTED. These are internal to the blacklist. |
- net::TestURLRequestContext context; |
- GURL test_host("http://www.test_host.com"); |
- std::unique_ptr<net::URLRequest> request = |
- context.CreateRequest(test_host, net::DEFAULT_PRIORITY, nullptr); |
- set_io_data(base::MakeUnique<TestPreviewsIOData>(loop_.task_runner(), |
- loop_.task_runner())); |
- base::HistogramTester histogram_tester; |
- |
- // If not in the field trial, don't log anything, and return false. |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectTotalCount("Previews.EligibilityReason.Offline", 0); |
- |
- // Enable Offline previews field trial. |
- base::FieldTrialList field_trial_list(nullptr); |
- std::map<std::string, std::string> params; |
- params["show_offline_pages"] = "true"; |
- variations::AssociateVariationParams("ClientSidePreviews", "Enabled", params); |
- base::FieldTrialList::CreateFieldTrial("ClientSidePreviews", "Enabled"); |
- |
- // The blacklist is not created yet. |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectUniqueSample( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::BLACKLIST_UNAVAILABLE), 1); |
- |
- set_ui_service(base::WrapUnique( |
- new PreviewsUIService(io_data(), loop_.task_runner(), |
- base::MakeUnique<TestPreviewsOptOutStore>()))); |
- |
- base::RunLoop().RunUntilIdle(); |
- |
- // Return one of the failing statuses from the blacklist; cause the blacklist |
- // to not be loaded. |
- io_data()->ClearBlackList(base::Time::Now(), base::Time::Now()); |
- |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectBucketCount( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::BLACKLIST_DATA_NOT_LOADED), |
- 1); |
- |
- // Reload the blacklist. The blacklist should allow all navigations now. |
- base::RunLoop().RunUntilIdle(); |
- |
- // NQE should be null on the context. |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectBucketCount( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::NETWORK_QUALITY_UNAVAILABLE), |
- 1); |
- |
- net::TestNetworkQualityEstimator network_quality_estimator(params); |
- context.set_network_quality_estimator(&network_quality_estimator); |
- |
- // Set NQE type to unknown. |
- network_quality_estimator.set_effective_connection_type( |
- net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN); |
- |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectBucketCount( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::NETWORK_QUALITY_UNAVAILABLE), |
- 2); |
- |
- // Set NQE type to fast enough. |
- network_quality_estimator.set_effective_connection_type( |
- net::EFFECTIVE_CONNECTION_TYPE_2G); |
- EXPECT_FALSE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectBucketCount( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::NETWORK_NOT_SLOW), 1); |
- |
- // Set NQE type to slow. |
- network_quality_estimator.set_effective_connection_type( |
- net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G); |
- |
- EXPECT_TRUE(io_data()->ShouldAllowPreview(*request, PreviewsType::OFFLINE)); |
- histogram_tester.ExpectBucketCount( |
- "Previews.EligibilityReason.Offline", |
- static_cast<int>(PreviewsEligibilityReason::ALLOWED), 1); |
- |
- histogram_tester.ExpectTotalCount("Previews.EligibilityReason.Offline", 6); |
- |
- variations::testing::ClearAllVariationParams(); |
-} |
- |
} // namespace previews |