| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 PROTECTION_ENABLED_EXTENSIONS, | 140 PROTECTION_ENABLED_EXTENSIONS, |
| 141 // Represents the strongest level (i.e. always equivalent to the last one in | 141 // Represents the strongest level (i.e. always equivalent to the last one in |
| 142 // terms of protection), leave this one last when adding new levels. | 142 // terms of protection), leave this one last when adding new levels. |
| 143 PROTECTION_ENABLED_ALL | 143 PROTECTION_ENABLED_ALL |
| 144 }; | 144 }; |
| 145 | 145 |
| 146 PrefHashBrowserTestBase() | 146 PrefHashBrowserTestBase() |
| 147 : protection_level_(GetProtectionLevelFromTrialGroup(GetParam())) { | 147 : protection_level_(GetProtectionLevelFromTrialGroup(GetParam())) { |
| 148 } | 148 } |
| 149 | 149 |
| 150 void SetUpCommandLine(CommandLine* command_line) override { | 150 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 151 ExtensionBrowserTest::SetUpCommandLine(command_line); | 151 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 152 EXPECT_FALSE(command_line->HasSwitch(switches::kForceFieldTrials)); | 152 EXPECT_FALSE(command_line->HasSwitch(switches::kForceFieldTrials)); |
| 153 command_line->AppendSwitchASCII( | 153 command_line->AppendSwitchASCII( |
| 154 switches::kForceFieldTrials, | 154 switches::kForceFieldTrials, |
| 155 std::string(chrome_prefs::internals::kSettingsEnforcementTrialName) + | 155 std::string(chrome_prefs::internals::kSettingsEnforcementTrialName) + |
| 156 "/" + GetParam() + "/"); | 156 "/" + GetParam() + "/"); |
| 157 #if defined(OS_CHROMEOS) | 157 #if defined(OS_CHROMEOS) |
| 158 command_line->AppendSwitch( | 158 command_line->AppendSwitch( |
| 159 chromeos::switches::kIgnoreUserProfileMappingForTests); | 159 chromeos::switches::kIgnoreUserProfileMappingForTests); |
| 160 #endif | 160 #endif |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 910 "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE)); | 910 "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE)); |
| 911 EXPECT_EQ( | 911 EXPECT_EQ( |
| 912 0, | 912 0, |
| 913 GetTrackedPrefHistogramCount( | 913 GetTrackedPrefHistogramCount( |
| 914 "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE)); | 914 "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE)); |
| 915 } | 915 } |
| 916 }; | 916 }; |
| 917 | 917 |
| 918 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe, | 918 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe, |
| 919 UntrustedAdditionToPrefsAfterWipe); | 919 UntrustedAdditionToPrefsAfterWipe); |
| OLD | NEW |