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

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

Issue 8896023: Fixed the value of "controlledBy" for preferences when they're set by the user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 <string> 5 #include <string>
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/prefs/pref_model_associator.h" 10 #include "chrome/browser/prefs/pref_model_associator.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 603 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
604 prefs::kRecommendedPlatformPref)); 604 prefs::kRecommendedPlatformPref));
605 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 605 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
606 prefs::kRecommendedCloudPref)); 606 prefs::kRecommendedCloudPref));
607 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 607 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
608 prefs::kDefaultPref)); 608 prefs::kDefaultPref));
609 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore( 609 EXPECT_FALSE(pref_value_store_->PrefValueFromUserStore(
610 prefs::kMissingPref)); 610 prefs::kMissingPref));
611 } 611 }
612 612
613 TEST_F(PrefValueStoreTest, PrefValueFromRecommendedStore) {
614 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
615 prefs::kManagedPlatformPref));
616 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
617 prefs::kManagedCloudPref));
618 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
619 prefs::kExtensionPref));
620 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
621 prefs::kCommandLinePref));
622 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
623 prefs::kUserPref));
624 EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore(
625 prefs::kRecommendedPlatformPref));
626 EXPECT_TRUE(pref_value_store_->PrefValueFromRecommendedStore(
627 prefs::kRecommendedCloudPref));
628 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
629 prefs::kDefaultPref));
630 EXPECT_FALSE(pref_value_store_->PrefValueFromRecommendedStore(
631 prefs::kMissingPref));
632 }
633
613 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) { 634 TEST_F(PrefValueStoreTest, PrefValueFromDefaultStore) {
614 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 635 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
615 prefs::kManagedPlatformPref)); 636 prefs::kManagedPlatformPref));
616 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 637 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
617 prefs::kManagedCloudPref)); 638 prefs::kManagedCloudPref));
618 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 639 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
619 prefs::kExtensionPref)); 640 prefs::kExtensionPref));
620 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 641 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
621 prefs::kCommandLinePref)); 642 prefs::kCommandLinePref));
622 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore( 643 EXPECT_FALSE(pref_value_store_->PrefValueFromDefaultStore(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 prefs::kUserPref)); 686 prefs::kUserPref));
666 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 687 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
667 prefs::kRecommendedPlatformPref)); 688 prefs::kRecommendedPlatformPref));
668 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 689 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
669 prefs::kRecommendedCloudPref)); 690 prefs::kRecommendedCloudPref));
670 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 691 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
671 prefs::kDefaultPref)); 692 prefs::kDefaultPref));
672 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable( 693 EXPECT_TRUE(pref_value_store_->PrefValueExtensionModifiable(
673 prefs::kMissingPref)); 694 prefs::kMissingPref));
674 } 695 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_value_store.cc ('k') | chrome/browser/ui/webui/options/core_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698