| Index: chrome/common/origin_trials/chrome_origin_trial_policy_unittest.cc | 
| diff --git a/chrome/common/origin_trials/origin_trial_key_manager_unittest.cc b/chrome/common/origin_trials/chrome_origin_trial_policy_unittest.cc | 
| similarity index 77% | 
| rename from chrome/common/origin_trials/origin_trial_key_manager_unittest.cc | 
| rename to chrome/common/origin_trials/chrome_origin_trial_policy_unittest.cc | 
| index 83a2c4df6679cea3f673293c41103643dcdc7fc7..00f3a8dfc7c147c6f3979bf99b61e3fb2366fe64 100644 | 
| --- a/chrome/common/origin_trials/origin_trial_key_manager_unittest.cc | 
| +++ b/chrome/common/origin_trials/chrome_origin_trial_policy_unittest.cc | 
| @@ -2,7 +2,7 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "chrome/common/origin_trials/origin_trial_key_manager.h" | 
| +#include "chrome/common/origin_trials/chrome_origin_trial_policy.h" | 
|  | 
| #include <memory> | 
|  | 
| @@ -33,24 +33,24 @@ const char kTwoDisabledFeatures[] = "A|B"; | 
| const char kThreeDisabledFeatures[] = "A|B|C"; | 
| const char kSpacesInDisabledFeatures[] = "A|B C"; | 
|  | 
| -class OriginTrialKeyManagerTest : public testing::Test { | 
| +class ChromeOriginTrialPolicyTest : public testing::Test { | 
| protected: | 
| -  OriginTrialKeyManagerTest() | 
| -      : manager_(base::WrapUnique(new OriginTrialKeyManager())), | 
| +  ChromeOriginTrialPolicyTest() | 
| +      : manager_(base::WrapUnique(new ChromeOriginTrialPolicy())), | 
| default_key_(manager_->GetPublicKey().as_string()), | 
| test_key_(std::string(reinterpret_cast<const char*>(kTestPublicKey), | 
| arraysize(kTestPublicKey))) {} | 
| -  OriginTrialKeyManager* manager() { return manager_.get(); } | 
| +  ChromeOriginTrialPolicy* manager() { return manager_.get(); } | 
| base::StringPiece default_key() { return default_key_; } | 
| base::StringPiece test_key() { return test_key_; } | 
|  | 
| private: | 
| -  std::unique_ptr<OriginTrialKeyManager> manager_; | 
| +  std::unique_ptr<ChromeOriginTrialPolicy> manager_; | 
| std::string default_key_; | 
| std::string test_key_; | 
| }; | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DefaultConstructor) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, DefaultConstructor) { | 
| // We don't specify here what the key should be, but make sure that it is | 
| // returned, is valid, and is consistent. | 
| base::StringPiece key = manager()->GetPublicKey(); | 
| @@ -58,61 +58,61 @@ TEST_F(OriginTrialKeyManagerTest, DefaultConstructor) { | 
| EXPECT_EQ(default_key(), key); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DefaultKeyIsConsistent) { | 
| -  OriginTrialKeyManager manager2; | 
| +TEST_F(ChromeOriginTrialPolicyTest, DefaultKeyIsConsistent) { | 
| +  ChromeOriginTrialPolicy manager2; | 
| EXPECT_EQ(manager()->GetPublicKey(), manager2.GetPublicKey()); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, OverridePublicKey) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, OverridePublicKey) { | 
| EXPECT_TRUE(manager()->SetPublicKeyFromASCIIString(kTestPublicKeyString)); | 
| EXPECT_NE(default_key(), manager()->GetPublicKey()); | 
| EXPECT_EQ(test_key(), manager()->GetPublicKey()); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, OverrideKeyNotBase64) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, OverrideKeyNotBase64) { | 
| EXPECT_FALSE( | 
| manager()->SetPublicKeyFromASCIIString(kBadEncodingPublicKeyString)); | 
| EXPECT_EQ(default_key(), manager()->GetPublicKey()); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, OverrideKeyTooShort) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, OverrideKeyTooShort) { | 
| EXPECT_FALSE( | 
| manager()->SetPublicKeyFromASCIIString(kTooShortPublicKeyString)); | 
| EXPECT_EQ(default_key(), manager()->GetPublicKey()); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, OverrideKeyTooLong) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, OverrideKeyTooLong) { | 
| EXPECT_FALSE(manager()->SetPublicKeyFromASCIIString(kTooLongPublicKeyString)); | 
| EXPECT_EQ(default_key(), manager()->GetPublicKey()); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, NoDisabledFeatures) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, NoDisabledFeatures) { | 
| EXPECT_FALSE(manager()->IsFeatureDisabled("A")); | 
| EXPECT_FALSE(manager()->IsFeatureDisabled("B")); | 
| EXPECT_FALSE(manager()->IsFeatureDisabled("C")); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DisableOneFeature) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, DisableOneFeature) { | 
| EXPECT_TRUE(manager()->SetDisabledFeatures(kOneDisabledFeature)); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("A")); | 
| EXPECT_FALSE(manager()->IsFeatureDisabled("B")); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DisableTwoFeatures) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, DisableTwoFeatures) { | 
| EXPECT_TRUE(manager()->SetDisabledFeatures(kTwoDisabledFeatures)); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("A")); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("B")); | 
| EXPECT_FALSE(manager()->IsFeatureDisabled("C")); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DisableThreeFeatures) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, DisableThreeFeatures) { | 
| EXPECT_TRUE(manager()->SetDisabledFeatures(kThreeDisabledFeatures)); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("A")); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("B")); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("C")); | 
| } | 
|  | 
| -TEST_F(OriginTrialKeyManagerTest, DisableFeatureWithSpace) { | 
| +TEST_F(ChromeOriginTrialPolicyTest, DisableFeatureWithSpace) { | 
| EXPECT_TRUE(manager()->SetDisabledFeatures(kSpacesInDisabledFeatures)); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("A")); | 
| EXPECT_TRUE(manager()->IsFeatureDisabled("B C")); | 
|  |