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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_service_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/device_settings_service.h" 5 #include "chrome/browser/chromeos/settings/device_settings_service.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 is_owner_set_ = true; 56 is_owner_set_ = true;
57 } 57 }
58 58
59 protected: 59 protected:
60 DeviceSettingsServiceTest() 60 DeviceSettingsServiceTest()
61 : operation_completed_(false), 61 : operation_completed_(false),
62 is_owner_(true), 62 is_owner_(true),
63 is_owner_set_(false), 63 is_owner_set_(false),
64 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {} 64 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {}
65 65
66 virtual void SetUp() override { 66 void SetUp() override {
67 device_policy_.payload().mutable_device_policy_refresh_rate()-> 67 device_policy_.payload().mutable_device_policy_refresh_rate()->
68 set_device_policy_refresh_rate(120); 68 set_device_policy_refresh_rate(120);
69 DeviceSettingsTestBase::SetUp(); 69 DeviceSettingsTestBase::SetUp();
70 } 70 }
71 71
72 void CheckPolicy() { 72 void CheckPolicy() {
73 ASSERT_TRUE(device_settings_service_.policy_data()); 73 ASSERT_TRUE(device_settings_service_.policy_data());
74 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(), 74 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(),
75 device_settings_service_.policy_data()->SerializeAsString()); 75 device_settings_service_.policy_data()->SerializeAsString());
76 ASSERT_TRUE(device_settings_service_.device_settings()); 76 ASSERT_TRUE(device_settings_service_.device_settings());
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 451 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
452 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 452 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
453 device_settings_service_.PropertyChangeComplete(true); 453 device_settings_service_.PropertyChangeComplete(true);
454 FlushDeviceSettings(); 454 FlushDeviceSettings();
455 Mock::VerifyAndClearExpectations(&observer_); 455 Mock::VerifyAndClearExpectations(&observer_);
456 456
457 device_settings_service_.RemoveObserver(&observer_); 457 device_settings_service_.RemoveObserver(&observer_);
458 } 458 }
459 459
460 } // namespace chromeos 460 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698