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

Unified Diff: content/browser/net_info_browsertest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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
« no previous file with comments | « content/browser/mime_registry_message_filter.h ('k') | content/browser/notification_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/net_info_browsertest.cc
diff --git a/content/browser/net_info_browsertest.cc b/content/browser/net_info_browsertest.cc
index 605ae818f20f74484a4ab0bd60a40a6ef13f579a..23a2968d84d24e28609e46b6d0e0085b93d91a0c 100644
--- a/content/browser/net_info_browsertest.cc
+++ b/content/browser/net_info_browsertest.cc
@@ -14,14 +14,14 @@
class NetInfoBrowserTest : public content::ContentBrowserTest {
protected:
- virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
// TODO(jkarlin): Once NetInfo is enabled on all platforms remove this
// switch.
command_line->AppendSwitch(switches::kEnableNetworkInformation);
}
#if defined(OS_CHROMEOS)
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
// ChromeOS's NetworkChangeNotifier isn't known to content and therefore
// doesn't get created in content_browsertests. Insert a mock
// NetworkChangeNotifier.
@@ -30,7 +30,7 @@ class NetInfoBrowserTest : public content::ContentBrowserTest {
}
#endif
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « content/browser/mime_registry_message_filter.h ('k') | content/browser/notification_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698