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

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

Issue 2777063003: Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Just rebased Created 3 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/prefs/session_startup_pref.h" 5 #include "chrome/browser/prefs/session_startup_pref.h"
6 #include "base/memory/ptr_util.h" 6 #include "base/memory/ptr_util.h"
7 #include "chrome/common/pref_names.h" 7 #include "chrome/common/pref_names.h"
8 #include "components/pref_registry/pref_registry_syncable.h" 8 #include "components/pref_registry/pref_registry_syncable.h"
9 #include "components/sync_preferences/testing_pref_service_syncable.h" 9 #include "components/sync_preferences/testing_pref_service_syncable.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 10 matching lines...) Expand all
21 21
22 user_prefs::PrefRegistrySyncable* registry() { 22 user_prefs::PrefRegistrySyncable* registry() {
23 return pref_service_->registry(); 23 return pref_service_->registry();
24 } 24 }
25 25
26 std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> pref_service_; 26 std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> pref_service_;
27 }; 27 };
28 28
29 TEST_F(SessionStartupPrefTest, URLListIsFixedUp) { 29 TEST_F(SessionStartupPrefTest, URLListIsFixedUp) {
30 auto url_pref_list = base::MakeUnique<base::ListValue>(); 30 auto url_pref_list = base::MakeUnique<base::ListValue>();
31 url_pref_list->Set(0, new base::Value("google.com")); 31 url_pref_list->Set(0, base::MakeUnique<base::Value>("google.com"));
32 url_pref_list->Set(1, new base::Value("chromium.org")); 32 url_pref_list->Set(1, base::MakeUnique<base::Value>("chromium.org"));
33 pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, 33 pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup,
34 std::move(url_pref_list)); 34 std::move(url_pref_list));
35 35
36 SessionStartupPref result = 36 SessionStartupPref result =
37 SessionStartupPref::GetStartupPref(pref_service_.get()); 37 SessionStartupPref::GetStartupPref(pref_service_.get());
38 EXPECT_EQ(2u, result.urls.size()); 38 EXPECT_EQ(2u, result.urls.size());
39 EXPECT_EQ("http://google.com/", result.urls[0].spec()); 39 EXPECT_EQ("http://google.com/", result.urls[0].spec());
40 EXPECT_EQ("http://chromium.org/", result.urls[1].spec()); 40 EXPECT_EQ("http://chromium.org/", result.urls[1].spec());
41 } 41 }
42 42
43 TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) { 43 TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) {
44 auto url_pref_list1 = base::MakeUnique<base::ListValue>(); 44 auto url_pref_list1 = base::MakeUnique<base::ListValue>();
45 url_pref_list1->Set(0, new base::Value("chromium.org")); 45 url_pref_list1->Set(0, base::MakeUnique<base::Value>("chromium.org"));
46 pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, 46 pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup,
47 std::move(url_pref_list1)); 47 std::move(url_pref_list1));
48 48
49 auto url_pref_list2 = base::MakeUnique<base::ListValue>(); 49 auto url_pref_list2 = base::MakeUnique<base::ListValue>();
50 url_pref_list2->Set(0, new base::Value("chromium.org")); 50 url_pref_list2->Set(0, base::MakeUnique<base::Value>("chromium.org"));
51 url_pref_list2->Set(1, new base::Value("chromium.org")); 51 url_pref_list2->Set(1, base::MakeUnique<base::Value>("chromium.org"));
52 url_pref_list2->Set(2, new base::Value("chromium.org")); 52 url_pref_list2->Set(2, base::MakeUnique<base::Value>("chromium.org"));
53 pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup, 53 pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup,
54 std::move(url_pref_list2)); 54 std::move(url_pref_list2));
55 55
56 SessionStartupPref result = 56 SessionStartupPref result =
57 SessionStartupPref::GetStartupPref(pref_service_.get()); 57 SessionStartupPref::GetStartupPref(pref_service_.get());
58 EXPECT_EQ(3u, result.urls.size()); 58 EXPECT_EQ(3u, result.urls.size());
59 59
60 SessionStartupPref override_test = 60 SessionStartupPref override_test =
61 SessionStartupPref(SessionStartupPref::URLS); 61 SessionStartupPref(SessionStartupPref::URLS);
62 override_test.urls.push_back(GURL("dev.chromium.org")); 62 override_test.urls.push_back(GURL("dev.chromium.org"));
63 SessionStartupPref::SetStartupPref(pref_service_.get(), override_test); 63 SessionStartupPref::SetStartupPref(pref_service_.get(), override_test);
64 64
65 result = SessionStartupPref::GetStartupPref(pref_service_.get()); 65 result = SessionStartupPref::GetStartupPref(pref_service_.get());
66 EXPECT_EQ(3u, result.urls.size()); 66 EXPECT_EQ(3u, result.urls.size());
67 } 67 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698