| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
|
| index 2ecec4cf8e55f3a127dff1ed88e8fdf42f9c4179..e66780a45a567990708bac782136e13cb481ad0a 100644
|
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
|
| @@ -58,7 +58,7 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
|
|
|
| virtual ~UserCloudPolicyManagerTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| SetServerPolicy();
|
|
|
| @@ -68,13 +68,13 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
|
| OobeBaseTest::SetUp();
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
|
| test_server_->GetServiceURL().spec());
|
| OobeBaseTest::SetUpCommandLine(command_line);
|
| }
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| SetMergeSessionParams(kAccountId);
|
| SetupGaiaServerWithAccessTokens();
|
| OobeBaseTest::SetUpOnMainThread();
|
|
|