predictors: Add a origin for prefetch requests, remove the URL/host settings.

chrome/browser/predictors/resource_prefetch_common_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 38 matching lines @@
 
   void SetPreference(NetworkPredictionOptions value) {
     profile_->GetPrefs()->SetInteger(prefs::kNetworkPredictionOptions, value);
   }
 
   void SetCommandLineValue(const std::string& value) {
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kSpeculativeResourcePrefetching, value);
   }
 
-  void TestIsPrefetchEnabled(const ResourcePrefetchPredictorConfig& config) {
+  void TestIsPrefetchEnabledForOrigin(
+      const ResourcePrefetchPredictorConfig& config,
+      PrefetchOrigin origin) {
     EXPECT_TRUE(config.IsLearningEnabled());
-    EXPECT_TRUE(config.IsPrefetchingEnabled(profile_.get()));
-    EXPECT_TRUE(config.IsURLLearningEnabled());
-    EXPECT_TRUE(config.IsHostLearningEnabled());
-    EXPECT_TRUE(config.IsURLPrefetchingEnabled(profile_.get()));
-    EXPECT_TRUE(config.IsHostPrefetchingEnabled(profile_.get()));
+    EXPECT_TRUE(config.IsPrefetchingEnabledForOrigin(profile_.get(), origin));
   }
 
   void TestIsPrefetchLearning(const ResourcePrefetchPredictorConfig& config) {
     EXPECT_TRUE(config.IsLearningEnabled());
-    EXPECT_FALSE(config.IsPrefetchingEnabled(profile_.get()));
-    EXPECT_TRUE(config.IsURLLearningEnabled());
-    EXPECT_TRUE(config.IsHostLearningEnabled());
-    EXPECT_FALSE(config.IsURLPrefetchingEnabled(profile_.get()));
-    EXPECT_FALSE(config.IsHostPrefetchingEnabled(profile_.get()));
+    EXPECT_FALSE(config.IsPrefetchingEnabledForOrigin(
+        profile_.get(), PrefetchOrigin::EXTERNAL));
+    EXPECT_FALSE(config.IsPrefetchingEnabledForOrigin(
+        profile_.get(), PrefetchOrigin::NAVIGATION));
   }
 
   void TestIsDefaultExtraConfig(const ResourcePrefetchPredictorConfig& config) {
     EXPECT_FALSE(config.IsLowConfidenceForTest());
     EXPECT_FALSE(config.IsHighConfidenceForTest());
     EXPECT_FALSE(config.IsMoreResourcesEnabledForTest());
     EXPECT_FALSE(config.IsSmallDBEnabledForTest());
   }
 
  protected:
   base::MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
   std::unique_ptr<TestingProfile> profile_;
 };
 
 ResourcePrefetchCommonTest::ResourcePrefetchCommonTest()
     : loop_(base::MessageLoop::TYPE_DEFAULT),
       ui_thread_(content::BrowserThread::UI, &loop_),
       profile_(new TestingProfile()) { }
 
 TEST_F(ResourcePrefetchCommonTest, IsDisabledByDefault) {
   ResourcePrefetchPredictorConfig config;
   EXPECT_FALSE(
       IsSpeculativeResourcePrefetchingEnabled(profile_.get(), &config));
 
   EXPECT_FALSE(config.IsLearningEnabled());
-  EXPECT_FALSE(config.IsPrefetchingEnabled(profile_.get()));
-  EXPECT_FALSE(config.IsURLLearningEnabled());
-  EXPECT_FALSE(config.IsHostLearningEnabled());
-  EXPECT_FALSE(config.IsURLPrefetchingEnabled(profile_.get()));
-  EXPECT_FALSE(config.IsHostPrefetchingEnabled(profile_.get()));
+  EXPECT_FALSE(config.IsPrefetchingEnabledForOrigin(profile_.get(),
+                                                    PrefetchOrigin::EXTERNAL));
+  EXPECT_FALSE(config.IsLearningEnabled());
 
   TestIsDefaultExtraConfig(config);
 }
 
 TEST_F(ResourcePrefetchCommonTest, EnableLearning) {
-  SetCommandLineValue("learning");
+  SetCommandLineValue(switches::kSpeculativeResourcePrefetchingLearning);
   ResourcePrefetchPredictorConfig config;
   EXPECT_TRUE(IsSpeculativeResourcePrefetchingEnabled(profile_.get(), &config));
   TestIsPrefetchLearning(config);
   TestIsDefaultExtraConfig(config);
 }
 
 TEST_F(ResourcePrefetchCommonTest, EnablePrefetch) {
-  SetCommandLineValue("enabled");
+  SetCommandLineValue(switches::kSpeculativeResourcePrefetchingEnabled);
   ResourcePrefetchPredictorConfig config;
   EXPECT_TRUE(IsSpeculativeResourcePrefetchingEnabled(profile_.get(), &config));
-  TestIsPrefetchEnabled(config);
+  TestIsPrefetchEnabledForOrigin(config, PrefetchOrigin::EXTERNAL);
+  TestIsPrefetchEnabledForOrigin(config, PrefetchOrigin::NAVIGATION);
+  TestIsDefaultExtraConfig(config);
+}
+
+TEST_F(ResourcePrefetchCommonTest, EnablePrefetchExternalOnly) {
+  SetCommandLineValue(switches::kSpeculativeResourcePrefetchingEnabledExternal);
+  ResourcePrefetchPredictorConfig config;
+  EXPECT_TRUE(IsSpeculativeResourcePrefetchingEnabled(profile_.get(), &config));
+  TestIsPrefetchEnabledForOrigin(config, PrefetchOrigin::EXTERNAL);
+  EXPECT_FALSE(config.IsPrefetchingEnabledForOrigin(
+      profile_.get(), PrefetchOrigin::NAVIGATION));
   TestIsDefaultExtraConfig(config);
 }
 
 // Verifies whether prefetching is disabled according to the network type. But
 // learning should not be disabled by network.
 TEST_F(ResourcePrefetchCommonTest, RespectsNetworkSettings) {
-  SetCommandLineValue("enabled");
+  SetCommandLineValue(switches::kSpeculativeResourcePrefetchingEnabled);
   ResourcePrefetchPredictorConfig config;
   EXPECT_TRUE(IsSpeculativeResourcePrefetchingEnabled(profile_.get(), &config));
-  TestIsPrefetchEnabled(config);
+  TestIsPrefetchEnabledForOrigin(config, PrefetchOrigin::EXTERNAL);
   TestIsDefaultExtraConfig(config);
 
   // Set preference to WIFI_ONLY: prefetch when not on cellular.
   SetPreference(NetworkPredictionOptions::NETWORK_PREDICTION_WIFI_ONLY);
   {
     std::unique_ptr<NetworkChangeNotifier> mock(
         new MockNetworkChangeNotifierWIFI);
-    TestIsPrefetchEnabled(config);
+    TestIsPrefetchEnabledForOrigin(config, PrefetchOrigin::EXTERNAL);
   }
   {
     std::unique_ptr<NetworkChangeNotifier> mock(
         new MockNetworkChangeNotifier4G);
     TestIsPrefetchLearning(config);
   }
 
   // Set preference to NEVER: never prefetch.
   SetPreference(NetworkPredictionOptions::NETWORK_PREDICTION_NEVER);
   {
     std::unique_ptr<NetworkChangeNotifier> mock(
         new MockNetworkChangeNotifierWIFI);
     TestIsPrefetchLearning(config);
   }
   {
     std::unique_ptr<NetworkChangeNotifier> mock(
         new MockNetworkChangeNotifier4G);
     TestIsPrefetchLearning(config);
   }
 }
 
 }  // namespace predictors