Remove BackgroundHtmlParserTokenLimits and HtmlPreloadScanning studies.
Remove BackgroundHtmlParserTokenLimits as it is expired and is not
useful anymore. Clients receive only the default group for this study
which doesn't have any params.
Remove HtmlPreloadScanning study as it doesn't exists.
Also change unittests to not use the names of this studies even though
it doesn't affect the logic of the tests.
Bug: 799180
Change-Id: I57575bfe3cd9ec75067df739ee3aa2b6939e7c64
Reviewed-on: https://chromium-review.googlesource.com/857599
Reviewed-by: Bryan McQuade <[email protected]>
Commit-Queue: Gayane Petrosyan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#528335}diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 6249451..e2a2e12 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -184,10 +184,9 @@
class BlinkSettingsFieldTrialTest : public testing::Test {
public:
- static const char kParserFieldTrialName[];
- static const char kPreloadScanningFieldTrialName[];
+ static const char kDisallowFetchFieldTrialName[];
+ static const char kCSSExternalScannerFieldTrialName[];
static const char kFakeGroupName[];
- static const char kDefaultGroupName[];
BlinkSettingsFieldTrialTest()
: trial_list_(NULL),
@@ -240,12 +239,11 @@
content::TestBrowserThreadBundle thread_bundle_;
};
-const char BlinkSettingsFieldTrialTest::kParserFieldTrialName[] =
- "BackgroundHtmlParserTokenLimits";
-const char BlinkSettingsFieldTrialTest::kPreloadScanningFieldTrialName[] =
- "HtmlPreloadScanning";
+const char BlinkSettingsFieldTrialTest::kDisallowFetchFieldTrialName[] =
+ "DisallowFetchForDocWrittenScriptsInMainFrame";
+const char BlinkSettingsFieldTrialTest::kCSSExternalScannerFieldTrialName[] =
+ "CSSExternalScanner";
const char BlinkSettingsFieldTrialTest::kFakeGroupName[] = "FakeGroup";
-const char BlinkSettingsFieldTrialTest::kDefaultGroupName[] = "Default";
TEST_F(BlinkSettingsFieldTrialTest, NoFieldTrial) {
AppendContentBrowserClientSwitches();
@@ -253,14 +251,14 @@
}
TEST_F(BlinkSettingsFieldTrialTest, FieldTrialWithoutParams) {
- CreateFieldTrial(kParserFieldTrialName, kFakeGroupName);
+ CreateFieldTrial(kDisallowFetchFieldTrialName, kFakeGroupName);
AppendContentBrowserClientSwitches();
EXPECT_FALSE(command_line().HasSwitch(switches::kBlinkSettings));
}
TEST_F(BlinkSettingsFieldTrialTest, BlinkSettingsSwitchAlreadySpecified) {
AppendBlinkSettingsSwitch("foo");
- CreateFieldTrialWithParams(kParserFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kDisallowFetchFieldTrialName, kFakeGroupName,
"key1", "value1", "key2", "value2");
AppendContentBrowserClientSwitches();
EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
@@ -269,7 +267,7 @@
}
TEST_F(BlinkSettingsFieldTrialTest, FieldTrialEnabled) {
- CreateFieldTrialWithParams(kParserFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kDisallowFetchFieldTrialName, kFakeGroupName,
"key1", "value1", "key2", "value2");
AppendContentBrowserClientSwitches();
EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
@@ -278,9 +276,9 @@
}
TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsEnabled) {
- CreateFieldTrialWithParams(kParserFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kDisallowFetchFieldTrialName, kFakeGroupName,
"key1", "value1", "key2", "value2");
- CreateFieldTrialWithParams(kPreloadScanningFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kCSSExternalScannerFieldTrialName, kFakeGroupName,
"keyA", "valueA", "keyB", "valueB");
AppendContentBrowserClientSwitches();
EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
@@ -289,9 +287,9 @@
}
TEST_F(BlinkSettingsFieldTrialTest, MultipleFieldTrialsDuplicateKeys) {
- CreateFieldTrialWithParams(kParserFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kDisallowFetchFieldTrialName, kFakeGroupName,
"key1", "value1", "key2", "value2");
- CreateFieldTrialWithParams(kPreloadScanningFieldTrialName, kFakeGroupName,
+ CreateFieldTrialWithParams(kCSSExternalScannerFieldTrialName, kFakeGroupName,
"key2", "duplicate", "key3", "value3");
AppendContentBrowserClientSwitches();
EXPECT_TRUE(command_line().HasSwitch(switches::kBlinkSettings));
