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

Side by Side Diff: chrome/browser/prefs/pref_model_associator_unittest.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/prefs/scoped_user_pref_update.h" 6 #include "base/prefs/scoped_user_pref_update.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/prefs/pref_model_associator.h" 8 #include "chrome/browser/prefs/pref_model_associator.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 const PrefService::Preference* pref = 89 const PrefService::Preference* pref =
90 pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); 90 pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
91 scoped_ptr<base::Value> merged_value( 91 scoped_ptr<base::Value> merged_value(
92 PrefModelAssociator::MergePreference(pref->name(), 92 PrefModelAssociator::MergePreference(pref->name(),
93 *pref->GetValue(), 93 *pref->GetValue(),
94 server_url_list_)); 94 server_url_list_));
95 EXPECT_TRUE(merged_value->Equals(&server_url_list_)); 95 EXPECT_TRUE(merged_value->Equals(&server_url_list_));
96 } 96 }
97 97
98 TEST_F(ListPreferenceMergeTest, ServerNull) { 98 TEST_F(ListPreferenceMergeTest, ServerNull) {
99 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); 99 scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
100 { 100 {
101 ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup); 101 ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
102 base::ListValue* local_list_value = update.Get(); 102 base::ListValue* local_list_value = update.Get();
103 local_list_value->Append(new base::StringValue(local_url0_)); 103 local_list_value->Append(new base::StringValue(local_url0_));
104 } 104 }
105 105
106 const PrefService::Preference* pref = 106 const PrefService::Preference* pref =
107 pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup); 107 pref_service_->FindPreference(prefs::kURLsToRestoreOnStartup);
108 scoped_ptr<base::Value> merged_value( 108 scoped_ptr<base::Value> merged_value(
109 PrefModelAssociator::MergePreference(pref->name(), 109 PrefModelAssociator::MergePreference(pref->name(),
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 const PrefService::Preference* pref = 226 const PrefService::Preference* pref =
227 pref_service_->FindPreference(prefs::kContentSettingsPatternPairs); 227 pref_service_->FindPreference(prefs::kContentSettingsPatternPairs);
228 scoped_ptr<base::Value> merged_value( 228 scoped_ptr<base::Value> merged_value(
229 PrefModelAssociator::MergePreference(pref->name(), 229 PrefModelAssociator::MergePreference(pref->name(),
230 *pref->GetValue(), 230 *pref->GetValue(),
231 server_patterns_)); 231 server_patterns_));
232 EXPECT_TRUE(merged_value->Equals(&server_patterns_)); 232 EXPECT_TRUE(merged_value->Equals(&server_patterns_));
233 } 233 }
234 234
235 TEST_F(DictionaryPreferenceMergeTest, ServerNull) { 235 TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
236 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); 236 scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
237 { 237 {
238 DictionaryPrefUpdate update(pref_service_, 238 DictionaryPrefUpdate update(pref_service_,
239 prefs::kContentSettingsPatternPairs); 239 prefs::kContentSettingsPatternPairs);
240 base::DictionaryValue* local_dict_value = update.Get(); 240 base::DictionaryValue* local_dict_value = update.Get();
241 SetContentPattern(local_dict_value, expression2_, content_type0_, 1); 241 SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
242 } 242 }
243 243
244 const PrefService::Preference* pref = 244 const PrefService::Preference* pref =
245 pref_service_->FindPreference(prefs::kContentSettingsPatternPairs); 245 pref_service_->FindPreference(prefs::kContentSettingsPatternPairs);
246 scoped_ptr<base::Value> merged_value( 246 scoped_ptr<base::Value> merged_value(
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 std::string expression0_; 412 std::string expression0_;
413 std::string expression1_; 413 std::string expression1_;
414 std::string content_type0_; 414 std::string content_type0_;
415 base::ListValue server_url_list_; 415 base::ListValue server_url_list_;
416 base::DictionaryValue server_patterns_; 416 base::DictionaryValue server_patterns_;
417 }; 417 };
418 418
419 TEST_F(IndividualPreferenceMergeTest, URLsToRestoreOnStartup) { 419 TEST_F(IndividualPreferenceMergeTest, URLsToRestoreOnStartup) {
420 EXPECT_TRUE(MergeListPreference(prefs::kURLsToRestoreOnStartup)); 420 EXPECT_TRUE(MergeListPreference(prefs::kURLsToRestoreOnStartup));
421 } 421 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698