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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 is_owner_set_ = true; 53 is_owner_set_ = true;
54 } 54 }
55 55
56 protected: 56 protected:
57 DeviceSettingsServiceTest() 57 DeviceSettingsServiceTest()
58 : operation_completed_(false), 58 : operation_completed_(false),
59 is_owner_(true), 59 is_owner_(true),
60 is_owner_set_(false), 60 is_owner_set_(false),
61 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {} 61 ownership_status_(DeviceSettingsService::OWNERSHIP_UNKNOWN) {}
62 62
63 virtual void SetUp() OVERRIDE { 63 virtual void SetUp() override {
64 device_policy_.payload().mutable_device_policy_refresh_rate()-> 64 device_policy_.payload().mutable_device_policy_refresh_rate()->
65 set_device_policy_refresh_rate(120); 65 set_device_policy_refresh_rate(120);
66 DeviceSettingsTestBase::SetUp(); 66 DeviceSettingsTestBase::SetUp();
67 } 67 }
68 68
69 void CheckPolicy() { 69 void CheckPolicy() {
70 ASSERT_TRUE(device_settings_service_.policy_data()); 70 ASSERT_TRUE(device_settings_service_.policy_data());
71 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(), 71 EXPECT_EQ(device_policy_.policy_data().SerializeAsString(),
72 device_settings_service_.policy_data()->SerializeAsString()); 72 device_settings_service_.policy_data()->SerializeAsString());
73 ASSERT_TRUE(device_settings_service_.device_settings()); 73 ASSERT_TRUE(device_settings_service_.device_settings());
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 644 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
645 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 645 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
646 device_settings_service_.PropertyChangeComplete(true); 646 device_settings_service_.PropertyChangeComplete(true);
647 FlushDeviceSettings(); 647 FlushDeviceSettings();
648 Mock::VerifyAndClearExpectations(&observer_); 648 Mock::VerifyAndClearExpectations(&observer_);
649 649
650 device_settings_service_.RemoveObserver(&observer_); 650 device_settings_service_.RemoveObserver(&observer_);
651 } 651 }
652 652
653 } // namespace chromeos 653 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698