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

Side by Side Diff: chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc

Issue 851123003: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/settings/stub_cros_settings_provider.h" 5 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 13 matching lines...) Expand all
24 } // namespace 24 } // namespace
25 25
26 class StubCrosSettingsProviderTest : public testing::Test { 26 class StubCrosSettingsProviderTest : public testing::Test {
27 protected: 27 protected:
28 StubCrosSettingsProviderTest() 28 StubCrosSettingsProviderTest()
29 : provider_(new StubCrosSettingsProvider( 29 : provider_(new StubCrosSettingsProvider(
30 base::Bind(&StubCrosSettingsProviderTest::FireObservers, 30 base::Bind(&StubCrosSettingsProviderTest::FireObservers,
31 base::Unretained(this)))) { 31 base::Unretained(this)))) {
32 } 32 }
33 33
34 virtual ~StubCrosSettingsProviderTest() { 34 ~StubCrosSettingsProviderTest() override {}
35 }
36 35
37 virtual void SetUp() override { 36 void SetUp() override {
38 // Reset the observer notification count. 37 // Reset the observer notification count.
39 observer_count_.clear(); 38 observer_count_.clear();
40 } 39 }
41 40
42 void AssertPref(const std::string& prefName, const base::Value* value) { 41 void AssertPref(const std::string& prefName, const base::Value* value) {
43 const base::Value* pref = provider_->Get(prefName); 42 const base::Value* pref = provider_->Get(prefName);
44 ASSERT_TRUE(pref); 43 ASSERT_TRUE(pref);
45 ASSERT_TRUE(pref->Equals(value)); 44 ASSERT_TRUE(pref->Equals(value));
46 } 45 }
47 46
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 89 }
91 90
92 TEST_F(StubCrosSettingsProviderTest, PrepareTrustedValues) { 91 TEST_F(StubCrosSettingsProviderTest, PrepareTrustedValues) {
93 // Should return immediately without invoking the callback. 92 // Should return immediately without invoking the callback.
94 CrosSettingsProvider::TrustedStatus trusted = 93 CrosSettingsProvider::TrustedStatus trusted =
95 provider_->PrepareTrustedValues(base::Bind(&Fail)); 94 provider_->PrepareTrustedValues(base::Bind(&Fail));
96 EXPECT_EQ(CrosSettingsProvider::TRUSTED, trusted); 95 EXPECT_EQ(CrosSettingsProvider::TRUSTED, trusted);
97 } 96 }
98 97
99 } // namespace chromeos 98 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698