| Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| index 413a47174c1b7b27538462b1663745382bbb6cd0..4ce44c6cb7f742c1c924374b278259cc56c8de39 100644
|
| --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| @@ -200,7 +200,7 @@ class CloudPolicyTest : public InProcessBrowserTest,
|
| CloudPolicyTest() {}
|
| virtual ~CloudPolicyTest() {}
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| + virtual void SetUpInProcessBrowserTestFixture() override {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| ASSERT_NO_FATAL_FAILURE(SetServerPolicy(GetEmptyPolicy()));
|
|
|
| @@ -216,7 +216,7 @@ class CloudPolicyTest : public InProcessBrowserTest,
|
| RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
|
| }
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service()))
|
| << "Pre-existing policies in this machine will make this test fail.";
|
|
|
| @@ -310,14 +310,14 @@ class CloudPolicyTest : public InProcessBrowserTest,
|
|
|
| virtual void OnPolicyUpdated(const PolicyNamespace& ns,
|
| const PolicyMap& previous,
|
| - const PolicyMap& current) OVERRIDE {
|
| + const PolicyMap& current) override {
|
| if (!on_policy_updated_.is_null()) {
|
| on_policy_updated_.Run();
|
| on_policy_updated_.Reset();
|
| }
|
| }
|
|
|
| - virtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE {}
|
| + virtual void OnPolicyServiceInitialized(PolicyDomain domain) override {}
|
|
|
| base::ScopedTempDir temp_dir_;
|
| scoped_ptr<LocalPolicyTestServer> test_server_;
|
|
|