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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/prefs/mock_pref_change_callback.h"
5 #include "base/prefs/public/pref_change_registrar.h" 6 #include "base/prefs/public/pref_change_registrar.h"
6 #include "chrome/browser/prefs/mock_pref_change_callback.h"
7 #include "chrome/browser/prefs/pref_registry_syncable.h" 7 #include "chrome/browser/prefs/pref_registry_syncable.h"
8 #include "chrome/browser/prefs/scoped_user_pref_update.h" 8 #include "chrome/browser/prefs/scoped_user_pref_update.h"
9 #include "chrome/test/base/testing_pref_service.h" 9 #include "chrome/test/base/testing_pref_service.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using testing::_; 13 using testing::_;
14 using testing::Mock; 14 using testing::Mock;
15 15
16 class ScopedUserPrefUpdateTest : public testing::Test { 16 class ScopedUserPrefUpdateTest : public testing::Test {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) { 74 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) {
75 const DictionaryValue* old_value = prefs_.GetDictionary(kPref); 75 const DictionaryValue* old_value = prefs_.GetDictionary(kPref);
76 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0); 76 EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
77 { 77 {
78 DictionaryPrefUpdate update(&prefs_, kPref); 78 DictionaryPrefUpdate update(&prefs_, kPref);
79 } 79 }
80 const DictionaryValue* new_value = prefs_.GetDictionary(kPref); 80 const DictionaryValue* new_value = prefs_.GetDictionary(kPref);
81 EXPECT_EQ(old_value, new_value); 81 EXPECT_EQ(old_value, new_value);
82 Mock::VerifyAndClearExpectations(&observer_); 82 Mock::VerifyAndClearExpectations(&observer_);
83 } 83 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/scoped_user_pref_update.cc ('k') | chrome/browser/prefs/session_startup_pref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698