| OLD | NEW |
| 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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 | 676 |
| 677 ext1_ = ext1_scoped_.get(); | 677 ext1_ = ext1_scoped_.get(); |
| 678 ext2_ = ext2_scoped_.get(); | 678 ext2_ = ext2_scoped_.get(); |
| 679 ext3_ = ext3_scoped_.get(); | 679 ext3_ = ext3_scoped_.get(); |
| 680 | 680 |
| 681 for (size_t i = 0; i < arraysize(installed); ++i) | 681 for (size_t i = 0; i < arraysize(installed); ++i) |
| 682 installed[i] = false; | 682 installed[i] = false; |
| 683 } | 683 } |
| 684 | 684 |
| 685 void RegisterPreferences() { | 685 void RegisterPreferences() { |
| 686 prefs()->pref_service()->RegisterStringPref(kPref1, kDefaultPref1); | 686 prefs()->pref_service()->RegisterStringPref(kPref1, |
| 687 prefs()->pref_service()->RegisterStringPref(kPref2, kDefaultPref2); | 687 kDefaultPref1, |
| 688 prefs()->pref_service()->RegisterStringPref(kPref3, kDefaultPref3); | 688 false /* don't sync pref */); |
| 689 prefs()->pref_service()->RegisterStringPref(kPref4, kDefaultPref4); | 689 prefs()->pref_service()->RegisterStringPref(kPref2, |
| 690 kDefaultPref2, |
| 691 false /* don't sync pref */); |
| 692 prefs()->pref_service()->RegisterStringPref(kPref3, |
| 693 kDefaultPref3, |
| 694 false /* don't sync pref */); |
| 695 prefs()->pref_service()->RegisterStringPref(kPref4, |
| 696 kDefaultPref4, |
| 697 false /* don't sync pref */); |
| 690 } | 698 } |
| 691 | 699 |
| 692 void InstallExtControlledPref(Extension *ext, | 700 void InstallExtControlledPref(Extension *ext, |
| 693 const std::string& key, | 701 const std::string& key, |
| 694 Value* val) { | 702 Value* val) { |
| 695 EnsureExtensionInstalled(ext); | 703 EnsureExtensionInstalled(ext); |
| 696 prefs()->SetExtensionControlledPref(ext->id(), key, false, val); | 704 prefs()->SetExtensionControlledPref(ext->id(), key, false, val); |
| 697 } | 705 } |
| 698 | 706 |
| 699 void InstallExtControlledPrefIncognito(Extension *ext, | 707 void InstallExtControlledPrefIncognito(Extension *ext, |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 testing::Mock::VerifyAndClearExpectations(v1i); | 959 testing::Mock::VerifyAndClearExpectations(v1i); |
| 952 testing::Mock::VerifyAndClearExpectations(v2); | 960 testing::Mock::VerifyAndClearExpectations(v2); |
| 953 testing::Mock::VerifyAndClearExpectations(v2i); | 961 testing::Mock::VerifyAndClearExpectations(v2i); |
| 954 } | 962 } |
| 955 | 963 |
| 956 virtual void Verify() { | 964 virtual void Verify() { |
| 957 } | 965 } |
| 958 }; | 966 }; |
| 959 TEST_F(ExtensionPrefsSetExtensionControlledPref, | 967 TEST_F(ExtensionPrefsSetExtensionControlledPref, |
| 960 ExtensionPrefsSetExtensionControlledPref) {} | 968 ExtensionPrefsSetExtensionControlledPref) {} |
| OLD | NEW |