| Index: chrome/browser/signin/signin_browsertest.cc
|
| diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc
|
| index 5354e4c1172c3d5edb1422a45a5fba487923b8d8..259bc3caa0d70e9f5ed7e137ecbaf4beac0225f0 100644
|
| --- a/chrome/browser/signin/signin_browsertest.cc
|
| +++ b/chrome/browser/signin/signin_browsertest.cc
|
| @@ -36,7 +36,7 @@ const char kNonSigninURL[] = "http://www.google.com";
|
|
|
| class SigninBrowserTest : public InProcessBrowserTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| https_server_.reset(new net::SpawnedTestServer(
|
| net::SpawnedTestServer::TYPE_HTTPS,
|
| net::SpawnedTestServer::kLocalhost,
|
| @@ -56,7 +56,7 @@ class SigninBrowserTest : public InProcessBrowserTest {
|
| command_line->AppendSwitch(switches::kEnableWebBasedSignin);
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| factory_.reset(new net::URLFetcherImplFactory());
|
| fake_factory_.reset(new net::FakeURLFetcherFactory(factory_.get()));
|
| fake_factory_->SetFakeResponse(
|
| @@ -69,7 +69,7 @@ class SigninBrowserTest : public InProcessBrowserTest {
|
| InProcessBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| if (fake_factory_.get()) {
|
| fake_factory_->ClearFakeResponses();
|
| fake_factory_.reset();
|
| @@ -186,7 +186,7 @@ class BackOnNTPCommitObserver : public content::WebContentsObserver {
|
| virtual void DidCommitProvisionalLoadForFrame(
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& url,
|
| - ui::PageTransition transition_type) OVERRIDE {
|
| + ui::PageTransition transition_type) override {
|
| if (url == GURL(chrome::kChromeUINewTabURL) ||
|
| url == GURL(chrome::kChromeSearchLocalNtpUrl)) {
|
| content::WindowedNotificationObserver observer(
|
|
|