| Index: chrome/browser/download/download_dir_policy_handler_unittest.cc
|
| diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc
|
| index f7e8acf15745e62e218f9a6b171d0cd1d5621037..194957cb877636610fa2a3c888afa607e14539d1 100644
|
| --- a/chrome/browser/download/download_dir_policy_handler_unittest.cc
|
| +++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc
|
| @@ -74,7 +74,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadDirectory) {
|
| EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
|
| policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::StringValue>(std::string()), nullptr);
|
| + base::MakeUnique<base::Value>(std::string()), nullptr);
|
| UpdateProviderPolicy(policy);
|
|
|
| // Setting a DownloadDirectory should disable the PromptForDownload pref.
|
| @@ -95,7 +95,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
|
| policy::PolicyMap policy;
|
| policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::StringValue>(kDriveNamePolicyVariableName),
|
| + base::MakeUnique<base::Value>(kDriveNamePolicyVariableName),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
|
|
| @@ -120,15 +120,15 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
|
|
|
| policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
|
| + base::MakeUnique<base::Value>(kUserIDHash), nullptr);
|
| UpdateProviderPolicy(policy);
|
| EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
|
|
|
| policy.Set(
|
| policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
|
| policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::StringValue>(
|
| - std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot),
|
| + base::MakeUnique<base::Value>(std::string(kDriveNamePolicyVariableName) +
|
| + kRelativeToDriveRoot),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
|
|
| @@ -144,7 +144,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
|
|
|
| policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
|
| policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
|
| + base::MakeUnique<base::Value>(kUserIDHash), nullptr);
|
| UpdateProviderPolicy(policy);
|
|
|
| EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
|
|
|