Fix Resource Priorities and Scheduling (Chrome Side)

chrome/browser/chrome_content_browser_client_unittest.cc

Index: chrome/browser/chrome_content_browser_client_unittest.cc
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 080fd2d1c2ead66e442484d2dc86f46a81968b55..9f5ef6773032fd972b0bd250a698210ff203727c 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -151,6 +151,14 @@ class BlinkSettingsFieldTrialTest : public testing::Test {
  public:
   static const char kParserFieldTrialName[];
   static const char kIFrameFieldTrialName[];
+  static const char kResourcePrioritiesFieldTrialName[];
+  static const char kGroupName[];
+  static const char kDefaultGroupName[];
+  static const char kEverythingGroupName[];
+  static const char kLateScriptsGroupName[];
+  static const char kFontsGroupName[];
+  static const char kAsyncScriptsGroupName[];
+  static const char kPrioritiesGroupName[];
 
   BlinkSettingsFieldTrialTest()
       : trial_list_(NULL),
@@ -165,18 +173,19 @@ class BlinkSettingsFieldTrialTest : public testing::Test {
     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);
   }
 
@@ -194,7 +203,6 @@ class BlinkSettingsFieldTrialTest : public testing::Test {
 
  private:
   static const int kFakeChildProcessId = 1;
-  static const char kGroupName[];
 
   ChromeContentBrowserClient client_;
   base::FieldTrialList trial_list_;
@@ -207,7 +215,20 @@ 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();
@@ -215,14 +236,20 @@ TEST_F(BlinkSettingsFieldTrialTest, NoFieldTrial) {
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, FieldTrialWithoutParams) {
-  CreateFieldTrial(kParserFieldTrialName);
+  CreateFieldTrial(kParserFieldTrialName, kGroupName);
+  AppendContentBrowserClientSwitches();
+  EXPECT_FALSE(command_line().HasSwitch(switches::kBlinkSettings));
+}
+
+TEST_F(BlinkSettingsFieldTrialTest, FieldTrialWithDefaultParams) {
+  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));
@@ -231,7 +258,7 @@ TEST_F(BlinkSettingsFieldTrialTest, BlinkSettingsSwitchAlreadySpecified) {
 }
 
 TEST_F(BlinkSettingsFieldTrialTest, FieldTrialEnabled) {
-  CreateFieldTrialWithParams(kParserFieldTrialName,
+  CreateFieldTrialWithParams(kParserFieldTrialName, kGroupName,
                              "key1", "value1", "key2", "value2");
   AppendContentBrowserClientSwitches();
   EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
@@ -240,9 +267,9 @@ TEST_F(BlinkSettingsFieldTrialTest, FieldTrialEnabled) {
 }
 
 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));
@@ -251,9 +278,9 @@ TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsEnabled) {
 }
 
 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));
@@ -261,6 +288,49 @@ TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsDuplicateKeys) {
             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)