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

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

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another-fix Created 4 years, 7 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 66
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, 75 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
76 policy::POLICY_LEVEL_MANDATORY, 76 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
77 policy::POLICY_SCOPE_USER, 77 base::WrapUnique(new base::StringValue(std::string())), nullptr);
78 policy::POLICY_SOURCE_CLOUD,
79 new base::StringValue(std::string()),
80 NULL);
81 UpdateProviderPolicy(policy); 78 UpdateProviderPolicy(policy);
82 79
83 // Setting a DownloadDirectory should disable the PromptForDownload pref. 80 // Setting a DownloadDirectory should disable the PromptForDownload pref.
84 const base::Value* value = NULL; 81 const base::Value* value = NULL;
85 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value)); 82 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
86 ASSERT_TRUE(value); 83 ASSERT_TRUE(value);
87 bool prompt_for_download = true; 84 bool prompt_for_download = true;
88 bool result = value->GetAsBoolean(&prompt_for_download); 85 bool result = value->GetAsBoolean(&prompt_for_download);
89 ASSERT_TRUE(result); 86 ASSERT_TRUE(result);
90 EXPECT_FALSE(prompt_for_download); 87 EXPECT_FALSE(prompt_for_download);
91 } 88 }
92 #endif 89 #endif
93 90
94 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
95 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) { 92 TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
96 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL)); 93 EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
97 94
98 policy::PolicyMap policy; 95 policy::PolicyMap policy;
99 policy.Set(policy::key::kDownloadDirectory, 96 policy.Set(
100 policy::POLICY_LEVEL_MANDATORY, 97 policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
101 policy::POLICY_SCOPE_USER, 98 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
102 policy::POLICY_SOURCE_CLOUD, 99 base::WrapUnique(new base::StringValue(kDriveNamePolicyVariableName)),
103 new base::StringValue(kDriveNamePolicyVariableName), 100 nullptr);
104 NULL);
105 UpdateProviderPolicy(policy); 101 UpdateProviderPolicy(policy);
106 102
107 const base::Value* value = NULL; 103 const base::Value* value = NULL;
108 bool prompt_for_download; 104 bool prompt_for_download;
109 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value)); 105 EXPECT_TRUE(store_->GetValue(prefs::kPromptForDownload, &value));
110 EXPECT_TRUE(value); 106 EXPECT_TRUE(value);
111 EXPECT_TRUE(value->GetAsBoolean(&prompt_for_download)); 107 EXPECT_TRUE(value->GetAsBoolean(&prompt_for_download));
112 EXPECT_FALSE(prompt_for_download); 108 EXPECT_FALSE(prompt_for_download);
113 109
114 bool disable_drive; 110 bool disable_drive;
115 EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value)); 111 EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value));
116 EXPECT_TRUE(value); 112 EXPECT_TRUE(value);
117 EXPECT_TRUE(value->GetAsBoolean(&disable_drive)); 113 EXPECT_TRUE(value->GetAsBoolean(&disable_drive));
118 EXPECT_FALSE(disable_drive); 114 EXPECT_FALSE(disable_drive);
119 115
120 std::string download_directory; 116 std::string download_directory;
121 EXPECT_TRUE(store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 117 EXPECT_TRUE(store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
122 EXPECT_TRUE(value); 118 EXPECT_TRUE(value);
123 EXPECT_TRUE(value->GetAsString(&download_directory)); 119 EXPECT_TRUE(value->GetAsString(&download_directory));
124 EXPECT_EQ(GetExpectedDownloadDirectory(), download_directory); 120 EXPECT_EQ(GetExpectedDownloadDirectory(), download_directory);
125 121
126 policy.Set(policy::key::kDownloadDirectory, 122 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
127 policy::POLICY_LEVEL_MANDATORY, 123 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
128 policy::POLICY_SCOPE_USER, 124 base::WrapUnique(new base::StringValue(kUserIDHash)), nullptr);
129 policy::POLICY_SOURCE_CLOUD,
130 new base::StringValue(kUserIDHash),
131 NULL);
132 UpdateProviderPolicy(policy); 125 UpdateProviderPolicy(policy);
133 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 126 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
134 127
135 policy.Set(policy::key::kDownloadDirectory, 128 policy.Set(
136 policy::POLICY_LEVEL_RECOMMENDED, 129 policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
137 policy::POLICY_SCOPE_USER, 130 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
138 policy::POLICY_SOURCE_CLOUD, 131 base::WrapUnique(new base::StringValue(
139 new base::StringValue(std::string(kDriveNamePolicyVariableName) + 132 std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot)),
140 kRelativeToDriveRoot), 133 nullptr);
141 NULL);
142 UpdateProviderPolicy(policy); 134 UpdateProviderPolicy(policy);
143 135
144 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL)); 136 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
145 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 137 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
146 138
147 EXPECT_TRUE( 139 EXPECT_TRUE(
148 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 140 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
149 EXPECT_TRUE(value); 141 EXPECT_TRUE(value);
150 EXPECT_TRUE(value->GetAsString(&download_directory)); 142 EXPECT_TRUE(value->GetAsString(&download_directory));
151 EXPECT_EQ(GetExpectedDownloadDirectory() + kRelativeToDriveRoot, 143 EXPECT_EQ(GetExpectedDownloadDirectory() + kRelativeToDriveRoot,
152 download_directory); 144 download_directory);
153 145
154 policy.Set(policy::key::kDownloadDirectory, 146 policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
155 policy::POLICY_LEVEL_RECOMMENDED, 147 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
156 policy::POLICY_SCOPE_USER, 148 base::WrapUnique(new base::StringValue(kUserIDHash)), nullptr);
157 policy::POLICY_SOURCE_CLOUD,
158 new base::StringValue(kUserIDHash),
159 NULL);
160 UpdateProviderPolicy(policy); 149 UpdateProviderPolicy(policy);
161 150
162 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL)); 151 EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
163 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL)); 152 EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
164 153
165 EXPECT_TRUE( 154 EXPECT_TRUE(
166 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value)); 155 recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
167 EXPECT_TRUE(value); 156 EXPECT_TRUE(value);
168 EXPECT_TRUE(value->GetAsString(&download_directory)); 157 EXPECT_TRUE(value->GetAsString(&download_directory));
169 EXPECT_EQ(kUserIDHash, download_directory); 158 EXPECT_EQ(kUserIDHash, download_directory);
170 } 159 }
171 #endif 160 #endif
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698