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

Side by Side Diff: chrome/browser/ui/webui/ntp/shown_sections_handler_unittest.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review Created 9 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 | Annotate | Revision Log
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 "chrome/browser/ui/webui/ntp/shown_sections_handler.h" 5 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/prefs/pref_value_store.h" 8 #include "chrome/browser/prefs/pref_value_store.h"
9 #include "chrome/common/json_pref_store.h" 9 #include "chrome/common/json_pref_store.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/testing_pref_service.h" 11 #include "chrome/test/testing_pref_service.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 class ShownSectionsHandlerTest : public testing::Test { 14 class ShownSectionsHandlerTest : public testing::Test {
15 }; 15 };
16 16
17 namespace { 17 namespace {
18 18
19 int MigratePrefValue(PrefService* prefs, int starting_value) { 19 int MigratePrefValue(PrefService* prefs, int starting_value) {
20 prefs->SetInteger(prefs::kNTPShownSections, starting_value); 20 prefs->SetInteger(prefs::kNTPShownSections, starting_value);
21 ShownSectionsHandler::MigrateUserPrefs(prefs, 1, 3); 21 ShownSectionsHandler::MigrateUserPrefs(prefs, 1, 3);
22 return prefs->GetInteger(prefs::kNTPShownSections); 22 return prefs->GetInteger(prefs::kNTPShownSections);
23 } 23 }
24 24
25 } // namespace 25 } // namespace
26 26
27 TEST_F(ShownSectionsHandlerTest, MigrateUserPrefs) { 27 TEST_F(ShownSectionsHandlerTest, MigrateUserPrefs) {
28 scoped_ptr<PrefService> pref(new TestingPrefService); 28 scoped_ptr<PrefService> pref(new TestingPrefService);
29 29
30 pref->RegisterIntegerPref(prefs::kNTPShownSections, 0); 30 pref->RegisterIntegerPref(prefs::kNTPShownSections,
31 0,
32 false /* don't sync pref */);
31 33
32 EXPECT_EQ(APPS, MigratePrefValue(pref.get(), APPS)); 34 EXPECT_EQ(APPS, MigratePrefValue(pref.get(), APPS));
33 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), THUMB)); 35 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), THUMB));
34 EXPECT_EQ(APPS, MigratePrefValue(pref.get(), APPS | THUMB)); 36 EXPECT_EQ(APPS, MigratePrefValue(pref.get(), APPS | THUMB));
35 37
36 // 2 is not currently used, but older state may contain it and we should do 38 // 2 is not currently used, but older state may contain it and we should do
37 // something reasonable. 39 // something reasonable.
38 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), 3)); 40 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), 3));
39 41
40 // 0 can't correspond to any section, but we should still do something 42 // 0 can't correspond to any section, but we should still do something
41 // reasonable. 43 // reasonable.
42 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), 0)); 44 EXPECT_EQ(THUMB, MigratePrefValue(pref.get(), 0));
43 } 45 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698