| 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 "chrome/browser/api/prefs/pref_change_registrar.h" | 
 |   6 #include "chrome/browser/prefs/pref_observer_mock.h" | 
|   5 #include "chrome/browser/prefs/scoped_user_pref_update.h" |   7 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 
|   6 #include "chrome/browser/prefs/pref_change_registrar.h" |  | 
|   7 #include "chrome/browser/prefs/pref_observer_mock.h" |  | 
|   8 #include "chrome/test/base/testing_pref_service.h" |   8 #include "chrome/test/base/testing_pref_service.h" | 
|   9 #include "testing/gmock/include/gmock/gmock.h" |   9 #include "testing/gmock/include/gmock/gmock.h" | 
|  10 #include "testing/gtest/include/gtest/gtest.h" |  10 #include "testing/gtest/include/gtest/gtest.h" | 
|  11  |  11  | 
|  12 using testing::_; |  12 using testing::_; | 
|  13 using testing::Mock; |  13 using testing::Mock; | 
|  14  |  14  | 
|  15 class ScopedUserPrefUpdateTest : public testing::Test { |  15 class ScopedUserPrefUpdateTest : public testing::Test { | 
|  16  public: |  16  public: | 
|  17   ~ScopedUserPrefUpdateTest() {} |  17   ~ScopedUserPrefUpdateTest() {} | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  70 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) { |  70 TEST_F(ScopedUserPrefUpdateTest, NeverTouchAnything) { | 
|  71   const DictionaryValue* old_value = prefs_.GetDictionary(kPref); |  71   const DictionaryValue* old_value = prefs_.GetDictionary(kPref); | 
|  72   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0); |  72   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0); | 
|  73   { |  73   { | 
|  74     DictionaryPrefUpdate update(&prefs_, kPref); |  74     DictionaryPrefUpdate update(&prefs_, kPref); | 
|  75   } |  75   } | 
|  76   const DictionaryValue* new_value = prefs_.GetDictionary(kPref); |  76   const DictionaryValue* new_value = prefs_.GetDictionary(kPref); | 
|  77   EXPECT_EQ(old_value, new_value); |  77   EXPECT_EQ(old_value, new_value); | 
|  78   Mock::VerifyAndClearExpectations(&observer_); |  78   Mock::VerifyAndClearExpectations(&observer_); | 
|  79 } |  79 } | 
| OLD | NEW |