Fix Resource Priorities and Scheduling (Chrome Side)

chrome/browser/chrome_content_browser_client_unittest.cc

 // Copyright 2013 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 133 matching lines @@
   MaybeCopyDisableWebRtcEncryptionSwitch(version_info::Channel::STABLE);
   EXPECT_FALSE(to_command_line_.HasSwitch(switches::kDisableWebRtcEncryption));
 }
 
 #endif  // ENABLE_WEBRTC
 
 class BlinkSettingsFieldTrialTest : public testing::Test {
  public:
   static const char kParserFieldTrialName[];
   static const char kIFrameFieldTrialName[];
+  static const char kResourcePrioritiesFieldTrialName[];
+  static const char kGroupName[];

[mmenke, 2015/08/11 17:57:23]

kFakeGroupName?

[Pat Meenan, 2015/08/12 16:20:59]

Done.

+  static const char kDefaultGroupName[];
+  static const char kEverythingGroupName[];
+  static const char kLateScriptsGroupName[];
+  static const char kFontsGroupName[];
+  static const char kAsyncScriptsGroupName[];
+  static const char kPrioritiesGroupName[];

[mmenke, 2015/08/11 17:57:23]

Everything below kDefaultGroupName just be inlined in the tests (Not sure about
kDefaultGroupName - is group name "" by default or Default by default?).  It's
not at all clear that theye are all values for
kResourcePrioritiesFieldTrialName, and separating them out from the tests makes
maintenance more of a pain.

[Pat Meenan, 2015/08/12 16:20:59]

Done.

 
   BlinkSettingsFieldTrialTest()
       : trial_list_(NULL),
         command_line_(base::CommandLine::NO_PROGRAM) {}
 
   void SetUp() override {
     command_line_.AppendSwitchASCII(
         switches::kProcessType, switches::kRendererProcess);
   }
 
   void TearDown() override {
     variations::testing::ClearAllVariationParams();
   }
 
-  void CreateFieldTrial(const char* trial_name) {
-    base::FieldTrialList::CreateFieldTrial(trial_name, kGroupName);
+  void CreateFieldTrial(const char* trial_name, const char* group_name) {
+    base::FieldTrialList::CreateFieldTrial(trial_name, group_name);
   }
 
   void CreateFieldTrialWithParams(
       const char* trial_name,
+      const char* group_name,
       const char* key1, const char* value1,
       const char* key2, const char* value2) {
     std::map<std::string, std::string> params;
     params.insert(std::make_pair(key1, value1));
     params.insert(std::make_pair(key2, value2));
-    CreateFieldTrial(trial_name);
+    CreateFieldTrial(trial_name, kGroupName);
     variations::AssociateVariationParams(trial_name, kGroupName, params);
   }
 
   void AppendContentBrowserClientSwitches() {
     client_.AppendExtraCommandLineSwitches(&command_line_, kFakeChildProcessId);
   }
 
   const base::CommandLine& command_line() const {
     return command_line_;
   }
 
   void AppendBlinkSettingsSwitch(const char* value) {
     command_line_.AppendSwitchASCII(switches::kBlinkSettings, value);
   }
 
  private:
   static const int kFakeChildProcessId = 1;
-  static const char kGroupName[];
 
   ChromeContentBrowserClient client_;
   base::FieldTrialList trial_list_;
   base::CommandLine command_line_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 const char BlinkSettingsFieldTrialTest::kParserFieldTrialName[] =
     "BackgroundHtmlParserTokenLimits";
 const char BlinkSettingsFieldTrialTest::kIFrameFieldTrialName[] =
     "LowPriorityIFrames";
+const char BlinkSettingsFieldTrialTest::kResourcePrioritiesFieldTrialName[] =
+    "ResourcePriorities";
 const char BlinkSettingsFieldTrialTest::kGroupName[] = "FakeGroup";
+const char BlinkSettingsFieldTrialTest::kDefaultGroupName[] = "Default";
+const char BlinkSettingsFieldTrialTest::kEverythingGroupName[] =
+    "Everything_11111_1_1_10";
+const char BlinkSettingsFieldTrialTest::kLateScriptsGroupName[] =
+    "LateScripts_10000_0_1_10";
+const char BlinkSettingsFieldTrialTest::kFontsGroupName[] =
+    "FontOnly_01000_0_1_10";
+const char BlinkSettingsFieldTrialTest::kAsyncScriptsGroupName[] =
+    "FontOnly_00100_0_1_10";
+const char BlinkSettingsFieldTrialTest::kPrioritiesGroupName[] =
+    "FontOnly_00010_0_1_10";
 
 TEST_F(BlinkSettingsFieldTrialTest, NoFieldTrial) {
   AppendContentBrowserClientSwitches();
   EXPECT_FALSE(command_line().HasSwitch(switches::kBlinkSettings));
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, FieldTrialWithoutParams) {
-  CreateFieldTrial(kParserFieldTrialName);
+  CreateFieldTrial(kParserFieldTrialName, kGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_FALSE(command_line().HasSwitch(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, FieldTrialWithDefaultParams) {

[mmenke, 2015/08/11 17:57:23]

ResourcePrioritiesDefault?

[mmenke, 2015/08/11 17:57:23]

This should probably go down with the other ResourcePriorities tests.

[Pat Meenan, 2015/08/12 16:20:59]

Done.

[Pat Meenan, 2015/08/12 16:20:59]

Done.

+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kDefaultGroupName);
   AppendContentBrowserClientSwitches();
   EXPECT_FALSE(command_line().HasSwitch(switches::kBlinkSettings));
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, BlinkSettingsSwitchAlreadySpecified) {
   AppendBlinkSettingsSwitch("foo");
-  CreateFieldTrialWithParams(kParserFieldTrialName,
+  CreateFieldTrialWithParams(kParserFieldTrialName, kGroupName,
                              "key1", "value1", "key2", "value2");
   AppendContentBrowserClientSwitches();
   EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
   EXPECT_EQ("foo",
             command_line().GetSwitchValueASCII(switches::kBlinkSettings));
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, FieldTrialEnabled) {
-  CreateFieldTrialWithParams(kParserFieldTrialName,
+  CreateFieldTrialWithParams(kParserFieldTrialName, kGroupName,
                              "key1", "value1", "key2", "value2");
   AppendContentBrowserClientSwitches();
   EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
   EXPECT_EQ("key1=value1,key2=value2",
             command_line().GetSwitchValueASCII(switches::kBlinkSettings));
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsEnabled) {
-  CreateFieldTrialWithParams(kParserFieldTrialName,
+  CreateFieldTrialWithParams(kParserFieldTrialName, kGroupName,
                              "key1", "value1", "key2", "value2");
-  CreateFieldTrialWithParams(kIFrameFieldTrialName,
+  CreateFieldTrialWithParams(kIFrameFieldTrialName, kGroupName,
                              "keyA", "valueA", "keyB", "valueB");
   AppendContentBrowserClientSwitches();
   EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
   EXPECT_EQ("key1=value1,key2=value2,keyA=valueA,keyB=valueB",
             command_line().GetSwitchValueASCII(switches::kBlinkSettings));
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsDuplicateKeys) {
-  CreateFieldTrialWithParams(kParserFieldTrialName,
+  CreateFieldTrialWithParams(kParserFieldTrialName, kGroupName,
                              "key1", "value1", "key2", "value2");
-  CreateFieldTrialWithParams(kIFrameFieldTrialName,
+  CreateFieldTrialWithParams(kIFrameFieldTrialName, kGroupName,
                              "key2", "duplicate", "key3", "value3");
   AppendContentBrowserClientSwitches();
   EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
   EXPECT_EQ("key1=value1,key2=value2,key2=duplicate,key3=value3",
             command_line().GetSwitchValueASCII(switches::kBlinkSettings));
 }
 
+TEST_F(BlinkSettingsFieldTrialTest, ResourcePrioritiesEverythingEnabled) {
+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kEverythingGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
+  EXPECT_EQ("fetchDeferLateScripts=true,"
+            "fetchIncreaseFontPriority=true,"
+            "fetchIncreaseAsyncScriptPriority=true,"
+            "fetchIncreasePriorities=true",
+            command_line().GetSwitchValueASCII(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, ResourcePrioritiesDeferLateScripts) {
+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kLateScriptsGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
+  EXPECT_EQ("fetchDeferLateScripts=true",
+            command_line().GetSwitchValueASCII(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, ResourcePrioritiesFontsEnabled) {
+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kFontsGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
+  EXPECT_EQ("fetchIncreaseFontPriority=true",
+            command_line().GetSwitchValueASCII(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, ResourcePrioritiesIncreaseAsyncScript) {
+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kAsyncScriptsGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
+  EXPECT_EQ("fetchIncreaseAsyncScriptPriority=true",
+            command_line().GetSwitchValueASCII(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, ResourcePrioritiesIncreasePriorities) {
+  CreateFieldTrial(kResourcePrioritiesFieldTrialName, kPrioritiesGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
+  EXPECT_EQ("fetchIncreasePriorities=true",
+            command_line().GetSwitchValueASCII(switches::kBlinkSettings));
+}
+
 }  // namespace chrome
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 namespace content {
 
 class InstantNTPURLRewriteTest : public BrowserWithTestWindowTest {
  protected:
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     field_trial_list_.reset(new base::FieldTrialList(
@@ skipping 32 matching lines @@
 
   NavigationEntry* entry = browser()->tab_strip_model()->
       GetActiveWebContents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(url_rewritten, entry->GetURL());
   EXPECT_EQ(url_original, entry->GetVirtualURL());
 }
 
 }  // namespace content
 #endif  // !defined(OS_IOS) && !defined(OS_ANDROID)