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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc

Issue 2888073002: Remove raw DictionaryValue::Set in //chrome (Closed)
Patch Set: Fix Tests Created 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised_user/supervised_user_whitelist_service.h" 5 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <utility>
11 12
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
15 #include "base/path_service.h" 16 #include "base/path_service.h"
16 #include "base/run_loop.h" 17 #include "base/run_loop.h"
17 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
19 #include "build/build_config.h" 20 #include "build/build_config.h"
20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 21 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 protected: 104 protected:
104 void PrepareInitialStateAndPreferences() { 105 void PrepareInitialStateAndPreferences() {
105 // Create two whitelists. 106 // Create two whitelists.
106 DictionaryPrefUpdate update(profile_.GetPrefs(), 107 DictionaryPrefUpdate update(profile_.GetPrefs(),
107 prefs::kSupervisedUserWhitelists); 108 prefs::kSupervisedUserWhitelists);
108 base::DictionaryValue* dict = update.Get(); 109 base::DictionaryValue* dict = update.Get();
109 110
110 std::unique_ptr<base::DictionaryValue> whitelist_dict( 111 std::unique_ptr<base::DictionaryValue> whitelist_dict(
111 new base::DictionaryValue); 112 new base::DictionaryValue);
112 whitelist_dict->SetString("name", "Whitelist A"); 113 whitelist_dict->SetString("name", "Whitelist A");
113 dict->Set("aaaa", whitelist_dict.release()); 114 dict->Set("aaaa", std::move(whitelist_dict));
114 115
115 whitelist_dict.reset(new base::DictionaryValue); 116 whitelist_dict.reset(new base::DictionaryValue);
116 whitelist_dict->SetString("name", "Whitelist B"); 117 whitelist_dict->SetString("name", "Whitelist B");
117 dict->Set("bbbb", whitelist_dict.release()); 118 dict->Set("bbbb", std::move(whitelist_dict));
118 119
119 installer_->RegisterWhitelist(kClientId, "aaaa", "Whitelist A"); 120 installer_->RegisterWhitelist(kClientId, "aaaa", "Whitelist A");
120 installer_->RegisterWhitelist(kClientId, "bbbb", "Whitelist B"); 121 installer_->RegisterWhitelist(kClientId, "bbbb", "Whitelist B");
121 } 122 }
122 123
123 void CheckFinalStateAndPreferences() { 124 void CheckFinalStateAndPreferences() {
124 EXPECT_EQ(2u, installer_->registered_whitelists().size()); 125 EXPECT_EQ(2u, installer_->registered_whitelists().size());
125 EXPECT_EQ(1u, installer_->registered_whitelists().count("bbbb")); 126 EXPECT_EQ(1u, installer_->registered_whitelists().count("bbbb"));
126 EXPECT_EQ(1u, installer_->registered_whitelists().count("cccc")); 127 EXPECT_EQ(1u, installer_->registered_whitelists().count("cccc"));
127 128
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS); 278 service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS);
278 ASSERT_EQ(2u, sync_data.size()); 279 ASSERT_EQ(2u, sync_data.size());
279 const sync_pb::ManagedUserWhitelistSpecifics* whitelist = 280 const sync_pb::ManagedUserWhitelistSpecifics* whitelist =
280 FindWhitelist(sync_data, "aaaa"); 281 FindWhitelist(sync_data, "aaaa");
281 ASSERT_TRUE(whitelist); 282 ASSERT_TRUE(whitelist);
282 EXPECT_EQ("Whitelist A", whitelist->name()); 283 EXPECT_EQ("Whitelist A", whitelist->name());
283 whitelist = FindWhitelist(sync_data, "bbbb"); 284 whitelist = FindWhitelist(sync_data, "bbbb");
284 ASSERT_TRUE(whitelist); 285 ASSERT_TRUE(whitelist);
285 EXPECT_EQ("Whitelist B", whitelist->name()); 286 EXPECT_EQ("Whitelist B", whitelist->name());
286 } 287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698