| Index: chrome/common/origin_trials/chrome_origin_trial_policy.cc
|
| diff --git a/chrome/common/origin_trials/origin_trial_key_manager.cc b/chrome/common/origin_trials/chrome_origin_trial_policy.cc
|
| similarity index 79%
|
| rename from chrome/common/origin_trials/origin_trial_key_manager.cc
|
| rename to chrome/common/origin_trials/chrome_origin_trial_policy.cc
|
| index f21a3a16360bac90863717488189ee0ff0c3ac59..1841ca44f75f51bb7497b6cd3684eaa618bd991a 100644
|
| --- a/chrome/common/origin_trials/origin_trial_key_manager.cc
|
| +++ b/chrome/common/origin_trials/chrome_origin_trial_policy.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 <stdint.h>
|
|
|
| @@ -20,13 +20,22 @@ static const uint8_t kDefaultPublicKey[] = {
|
| 0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
|
| };
|
|
|
| -OriginTrialKeyManager::OriginTrialKeyManager()
|
| +ChromeOriginTrialPolicy::ChromeOriginTrialPolicy()
|
| : public_key_(std::string(reinterpret_cast<const char*>(kDefaultPublicKey),
|
| arraysize(kDefaultPublicKey))) {}
|
|
|
| -OriginTrialKeyManager::~OriginTrialKeyManager() {}
|
| +ChromeOriginTrialPolicy::~ChromeOriginTrialPolicy() {}
|
|
|
| -bool OriginTrialKeyManager::SetPublicKeyFromASCIIString(
|
| +base::StringPiece ChromeOriginTrialPolicy::GetPublicKey() const {
|
| + return base::StringPiece(public_key_);
|
| +}
|
| +
|
| +bool ChromeOriginTrialPolicy::IsFeatureDisabled(
|
| + base::StringPiece feature) const {
|
| + return disabled_features_.count(feature.as_string()) > 0;
|
| +}
|
| +
|
| +bool ChromeOriginTrialPolicy::SetPublicKeyFromASCIIString(
|
| const std::string& ascii_public_key) {
|
| // Base64-decode the incoming string. Set the key if it is correctly formatted
|
| std::string new_public_key;
|
| @@ -38,11 +47,7 @@ bool OriginTrialKeyManager::SetPublicKeyFromASCIIString(
|
| return true;
|
| }
|
|
|
| -base::StringPiece OriginTrialKeyManager::GetPublicKey() const {
|
| - return base::StringPiece(public_key_);
|
| -}
|
| -
|
| -bool OriginTrialKeyManager::SetDisabledFeatures(
|
| +bool ChromeOriginTrialPolicy::SetDisabledFeatures(
|
| const std::string& disabled_feature_list) {
|
| std::set<std::string> new_disabled_features;
|
| const std::vector<std::string> features =
|
| @@ -53,7 +58,3 @@ bool OriginTrialKeyManager::SetDisabledFeatures(
|
| disabled_features_.swap(new_disabled_features);
|
| return true;
|
| }
|
| -
|
| -bool OriginTrialKeyManager::IsFeatureDisabled(base::StringPiece feature) const {
|
| - return disabled_features_.count(feature.as_string()) > 0;
|
| -}
|
|
|