Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: chrome/browser/download/download_dir_policy_handler_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/download/download_dir_policy_handler.h" 5 #include "chrome/browser/download/download_dir_policy_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 protected: 67 protected:
68 scoped_refptr<policy::ConfigurationPolicyPrefStore> recommended_store_; 68 scoped_refptr<policy::ConfigurationPolicyPrefStore> recommended_store_;
69 }; 69 };
70 70
71 #if !defined(OS_CHROMEOS) 71 #if !defined(OS_CHROMEOS)
72 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadDirectory) { 72 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadDirectory) {
73 policy::PolicyMap policy; 73 policy::PolicyMap policy;
74 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL)); 74 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
75 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, 75 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
76 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, 76 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
77 base::MakeUnique<base::StringValue>(std::string()), nullptr); 77 base::MakeUnique<base::Value>(std::string()), nullptr);
78 UpdateProviderPolicy(policy); 78 UpdateProviderPolicy(policy);
79 79
80 // Setting a DownloadDirectory should disable the PromptForDownload pref. 80 // Setting a DownloadDirectory should disable the PromptForDownload pref.
81 const base::Value* value = NULL; 81 const base::Value* value = NULL;
82 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value)); 82 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
83 ASSERT_TRUE(value); 83 ASSERT_TRUE(value);
84 bool prompt_for_download = true; 84 bool prompt_for_download = true;
85 bool result = value->GetAsBoolean(&prompt_for_download); 85 bool result = value->GetAsBoolean(&prompt_for_download);
86 ASSERT_TRUE(result); 86 ASSERT_TRUE(result);
87 EXPECT_FALSE(prompt_for_download); 87 EXPECT_FALSE(prompt_for_download);
88 } 88 }
89 #endif 89 #endif
90 90
91 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
92 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { 92 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
93 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL)); 93 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
94 94
95 policy::PolicyMap policy; 95 policy::PolicyMap policy;
96 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, 96 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
97 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, 97 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
98 base::MakeUnique<base::StringValue>(kDriveNamePolicyVariableName), 98 base::MakeUnique<base::Value>(kDriveNamePolicyVariableName),
99 nullptr); 99 nullptr);
100 UpdateProviderPolicy(policy); 100 UpdateProviderPolicy(policy);
101 101
102 const base::Value* value = NULL; 102 const base::Value* value = NULL;
103 bool prompt_for_download; 103 bool prompt_for_download;
104 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value)); 104 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
105 EXPECT_TRUE(value); 105 EXPECT_TRUE(value);
106 EXPECT_TRUE(value->GetAsBoolean(&prompt_for_download)); 106 EXPECT_TRUE(value->GetAsBoolean(&prompt_for_download));
107 EXPECT_FALSE(prompt_for_download); 107 EXPECT_FALSE(prompt_for_download);
108 108
109 bool disable_drive; 109 bool disable_drive;
110 EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value)); 110 EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value));
111 EXPECT_TRUE(value); 111 EXPECT_TRUE(value);
112 EXPECT_TRUE(value->GetAsBoolean(&disable_drive)); 112 EXPECT_TRUE(value->GetAsBoolean(&disable_drive));
113 EXPECT_FALSE(disable_drive); 113 EXPECT_FALSE(disable_drive);
114 114
115 std::string download_directory; 115 std::string download_directory;
116 EXPECT_TRUE(store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 116 EXPECT_TRUE(store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
117 EXPECT_TRUE(value); 117 EXPECT_TRUE(value);
118 EXPECT_TRUE(value->GetAsString(&download_directory)); 118 EXPECT_TRUE(value->GetAsString(&download_directory));
119 EXPECT_EQ(GetExpectedDownloadDirectory(), download_directory); 119 EXPECT_EQ(GetExpectedDownloadDirectory(), download_directory);
120 120
121 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY, 121 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
122 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, 122 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
123 base::MakeUnique<base::StringValue>(kUserIDHash), nullptr); 123 base::MakeUnique<base::Value>(kUserIDHash), nullptr);
124 UpdateProviderPolicy(policy); 124 UpdateProviderPolicy(policy);
125 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 125 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
126 126
127 policy.Set( 127 policy.Set(
128 policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED, 128 policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
129 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, 129 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
130 base::MakeUnique<base::StringValue>( 130 base::MakeUnique<base::Value>(std::string(kDriveNamePolicyVariableName) +
131 std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot), 131 kRelativeToDriveRoot),
132 nullptr); 132 nullptr);
133 UpdateProviderPolicy(policy); 133 UpdateProviderPolicy(policy);
134 134
135 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL)); 135 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
136 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 136 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
137 137
138 EXPECT_TRUE( 138 EXPECT_TRUE(
139 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 139 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
140 EXPECT_TRUE(value); 140 EXPECT_TRUE(value);
141 EXPECT_TRUE(value->GetAsString(&download_directory)); 141 EXPECT_TRUE(value->GetAsString(&download_directory));
142 EXPECT_EQ(GetExpectedDownloadDirectory() + kRelativeToDriveRoot, 142 EXPECT_EQ(GetExpectedDownloadDirectory() + kRelativeToDriveRoot,
143 download_directory); 143 download_directory);
144 144
145 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED, 145 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
146 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, 146 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
147 base::MakeUnique<base::StringValue>(kUserIDHash), nullptr); 147 base::MakeUnique<base::Value>(kUserIDHash), nullptr);
148 UpdateProviderPolicy(policy); 148 UpdateProviderPolicy(policy);
149 149
150 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL)); 150 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
151 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 151 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
152 152
153 EXPECT_TRUE( 153 EXPECT_TRUE(
154 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 154 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
155 EXPECT_TRUE(value); 155 EXPECT_TRUE(value);
156 EXPECT_TRUE(value->GetAsString(&download_directory)); 156 EXPECT_TRUE(value->GetAsString(&download_directory));
157 EXPECT_EQ(kUserIDHash, download_directory); 157 EXPECT_EQ(kUserIDHash, download_directory);
158 } 158 }
159 #endif 159 #endif
OLDNEW
« no previous file with comments | « chrome/browser/download/download_dir_policy_handler.cc ('k') | chrome/browser/download/download_query_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698