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

Side by Side Diff: chrome/browser/extensions/extension_prefs_unittest.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix. And rebase 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 "base/memory/scoped_temp_dir.h" 5 #include "base/memory/scoped_temp_dir.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stl_util-inl.h" 8 #include "base/stl_util-inl.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 671
672 ext1_ = ext1_scoped_.get(); 672 ext1_ = ext1_scoped_.get();
673 ext2_ = ext2_scoped_.get(); 673 ext2_ = ext2_scoped_.get();
674 ext3_ = ext3_scoped_.get(); 674 ext3_ = ext3_scoped_.get();
675 675
676 for (size_t i = 0; i < arraysize(installed); ++i) 676 for (size_t i = 0; i < arraysize(installed); ++i)
677 installed[i] = false; 677 installed[i] = false;
678 } 678 }
679 679
680 void RegisterPreferences() { 680 void RegisterPreferences() {
681 prefs()->pref_service()->RegisterStringPref(kPref1, kDefaultPref1); 681 prefs()->pref_service()->RegisterStringPref(kPref1,
682 prefs()->pref_service()->RegisterStringPref(kPref2, kDefaultPref2); 682 kDefaultPref1,
683 prefs()->pref_service()->RegisterStringPref(kPref3, kDefaultPref3); 683 PrefService::UNSYNCABLE_PREF);
684 prefs()->pref_service()->RegisterStringPref(kPref4, kDefaultPref4); 684 prefs()->pref_service()->RegisterStringPref(kPref2,
685 kDefaultPref2,
686 PrefService::UNSYNCABLE_PREF);
687 prefs()->pref_service()->RegisterStringPref(kPref3,
688 kDefaultPref3,
689 PrefService::UNSYNCABLE_PREF);
690 prefs()->pref_service()->RegisterStringPref(kPref4,
691 kDefaultPref4,
692 PrefService::UNSYNCABLE_PREF);
685 } 693 }
686 694
687 void InstallExtControlledPref(Extension *ext, 695 void InstallExtControlledPref(Extension *ext,
688 const std::string& key, 696 const std::string& key,
689 Value* val) { 697 Value* val) {
690 EnsureExtensionInstalled(ext); 698 EnsureExtensionInstalled(ext);
691 prefs()->SetExtensionControlledPref(ext->id(), key, false, val); 699 prefs()->SetExtensionControlledPref(ext->id(), key, false, val);
692 } 700 }
693 701
694 void InstallExtControlledPrefIncognito(Extension *ext, 702 void InstallExtControlledPrefIncognito(Extension *ext,
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 testing::Mock::VerifyAndClearExpectations(v1i); 954 testing::Mock::VerifyAndClearExpectations(v1i);
947 testing::Mock::VerifyAndClearExpectations(v2); 955 testing::Mock::VerifyAndClearExpectations(v2);
948 testing::Mock::VerifyAndClearExpectations(v2i); 956 testing::Mock::VerifyAndClearExpectations(v2i);
949 } 957 }
950 958
951 virtual void Verify() { 959 virtual void Verify() {
952 } 960 }
953 }; 961 };
954 TEST_F(ExtensionPrefsSetExtensionControlledPref, 962 TEST_F(ExtensionPrefsSetExtensionControlledPref,
955 ExtensionPrefsSetExtensionControlledPref) {} 963 ExtensionPrefsSetExtensionControlledPref) {}
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698