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

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_cros_browser_test.h

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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "chrome/browser/chromeos/policy/device_policy_builder.h" 10 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
(...skipping 29 matching lines...) Expand all
40 40
41 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosTestHelper); 41 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosTestHelper);
42 }; 42 };
43 43
44 // Used to test Device policy changes in Chrome OS. 44 // Used to test Device policy changes in Chrome OS.
45 class DevicePolicyCrosBrowserTest : public InProcessBrowserTest { 45 class DevicePolicyCrosBrowserTest : public InProcessBrowserTest {
46 protected: 46 protected:
47 DevicePolicyCrosBrowserTest(); 47 DevicePolicyCrosBrowserTest();
48 virtual ~DevicePolicyCrosBrowserTest(); 48 virtual ~DevicePolicyCrosBrowserTest();
49 49
50 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 50 virtual void SetUpInProcessBrowserTestFixture() override;
51 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE; 51 virtual void TearDownInProcessBrowserTestFixture() override;
52 52
53 // Marks the device as enterprise-owned. Must be called to make device 53 // Marks the device as enterprise-owned. Must be called to make device
54 // policies apply Chrome-wide. If this is not called, device policies will 54 // policies apply Chrome-wide. If this is not called, device policies will
55 // affect CrosSettings only. 55 // affect CrosSettings only.
56 void MarkAsEnterpriseOwned(); 56 void MarkAsEnterpriseOwned();
57 57
58 // Writes the owner key to disk. To be called before installing a policy. 58 // Writes the owner key to disk. To be called before installing a policy.
59 void InstallOwnerKey(); 59 void InstallOwnerKey();
60 60
61 // Reinstalls |device_policy_| as the policy (to be used when it was 61 // Reinstalls |device_policy_| as the policy (to be used when it was
(...skipping 16 matching lines...) Expand all
78 // FakeDBusThreadManager uses FakeSessionManagerClient. 78 // FakeDBusThreadManager uses FakeSessionManagerClient.
79 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_; 79 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_;
80 chromeos::FakeSessionManagerClient* fake_session_manager_client_; 80 chromeos::FakeSessionManagerClient* fake_session_manager_client_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest); 82 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
83 }; 83 };
84 84
85 } // namespace policy 85 } // namespace policy
86 86
87 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 87 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698