| Index: chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| index f5bcdf9f8168ed8be1f7858bbe8d6ca9cd50ab75..6587ad9586a0427766db9d61ba4face352f56d71 100644
|
| --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
|
| @@ -715,7 +715,7 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest,
|
| class ManagedPreferencesBrowserTest : public PreferencesBrowserTest {
|
| protected:
|
| // PreferencesBrowserTest implementation:
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| + virtual void SetUpInProcessBrowserTestFixture() override {
|
| // Set up fake install attributes.
|
| scoped_ptr<policy::StubEnterpriseInstallAttributes> attributes(
|
| new policy::StubEnterpriseInstallAttributes());
|
| @@ -813,7 +813,7 @@ const char* kUserProfilePath = "user_profile";
|
|
|
| class ProxyPreferencesBrowserTest : public PreferencesBrowserTest {
|
| public:
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| SetupNetworkEnvironment();
|
| content::RunAllPendingInMessageLoop();
|
|
|
|
|