projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
policy
/
cloud
/
cloud_policy_browsertest.cc
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
(file)
--- 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() {}
public PolicyService::Observer {
protected:
CloudPolicyTest() {}
-
virtual ~CloudPolicyTest()
{}
+
~CloudPolicyTest() override
{}
- v
irtual void SetUpInProcessBrowserTestFixture() OVERRIDE
{
+ v
oid SetUpInProcessBrowserTestFixture() override
{
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ASSERT_NO_FATAL_FAILURE(SetServerPolicy(GetEmptyPolicy()));
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ASSERT_NO_FATAL_FAILURE(SetServerPolicy(GetEmptyPolicy()));
@@
-216,7
+216,7
@@
class CloudPolicyTest : public InProcessBrowserTest,
RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
}
RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
}
- v
irtual void SetUpOnMainThread() OVERRIDE
{
+ v
oid SetUpOnMainThread() override
{
ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service()))
<< "Pre-existing policies in this machine will make this test fail.";
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");
}
return temp_dir_.path().AppendASCII("policy.json");
}
- v
irtual v
oid 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();
}
}
if (!on_policy_updated_.is_null()) {
on_policy_updated_.Run();
on_policy_updated_.Reset();
}
}
- v
irtual void OnPolicyServiceInitialized(PolicyDomain domain) OVERRIDE
{}
+ v
oid OnPolicyServiceInitialized(PolicyDomain domain) override
{}
base::ScopedTempDir temp_dir_;
scoped_ptr<LocalPolicyTestServer> test_server_;
base::ScopedTempDir temp_dir_;
scoped_ptr<LocalPolicyTestServer> test_server_;