Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: chrome/browser/net/websocket_browsertest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/websocket_browsertest.cc
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc
index 926e9b92dab984072c089e17952d52b19e3b315e..9adf29a963151de06aff23b7236c9febd5067d20 100644
--- a/chrome/browser/net/websocket_browsertest.cc
+++ b/chrome/browser/net/websocket_browsertest.cc
@@ -55,14 +55,14 @@ class WebSocketBrowserTest : public InProcessBrowserTest {
}
// Prepare the title watcher.
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
watcher_.reset(new content::TitleWatcher(
browser()->tab_strip_model()->GetActiveWebContents(),
base::ASCIIToUTF16("PASS")));
watcher_->AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
}
- virtual void TearDownOnMainThread() OVERRIDE { watcher_.reset(); }
+ virtual void TearDownOnMainThread() override { watcher_.reset(); }
std::string WaitAndGetTitle() {
return base::UTF16ToUTF8(watcher_->WaitAndGetTitle());
@@ -90,7 +90,7 @@ class WebSocketBrowserConnectToTest : public WebSocketBrowserTest {
// The title watcher and HTTP server are set up automatically by the test
// framework. Each test case still needs to configure and start the
// WebSocket server(s) it needs.
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
WebSocketBrowserTest::SetUpOnMainThread();
ASSERT_TRUE(http_server_.StartInBackground());
}
@@ -129,7 +129,7 @@ class AutoLogin : public content::NotificationObserver {
// NotificationObserver implementation
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE {
+ const content::NotificationDetails& details) override {
DCHECK_EQ(chrome::NOTIFICATION_AUTH_NEEDED, type);
scoped_refptr<LoginHandler> login_handler =
content::Details<LoginNotificationDetails>(details)->handler();

Powered by Google App Engine
This is Rietveld 408576698