X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fpolicy%2Fcloud%2Fcloud_policy_browsertest.cc;h=e04465dd242b0d4d97056e2ee2707a697b9df477;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=413a47174c1b7b27538462b1663745382bbb6cd0;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/src/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 413a471..e04465d 100644 --- a/src/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/src/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -198,9 +198,9 @@ class CloudPolicyTest : public InProcessBrowserTest, public PolicyService::Observer { protected: CloudPolicyTest() {} - virtual ~CloudPolicyTest() {} + ~CloudPolicyTest() override {} - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + 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 { + void SetUpOnMainThread() override { ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service())) << "Pre-existing policies in this machine will make this test fail."; @@ -308,16 +308,16 @@ class CloudPolicyTest : public InProcessBrowserTest, return temp_dir_.path().AppendASCII("policy.json"); } - virtual void OnPolicyUpdated(const PolicyNamespace& ns, - const PolicyMap& previous, - const PolicyMap& current) OVERRIDE { + void OnPolicyUpdated(const PolicyNamespace& ns, + const PolicyMap& previous, + const PolicyMap& current) override { if (!on_policy_updated_.is_null()) { on_policy_updated_.Run(); on_policy_updated_.Reset(); } } - virtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE {} + void OnPolicyServiceInitialized(PolicyDomain domain) override {} base::ScopedTempDir temp_dir_; scoped_ptr test_server_;