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

Unified Diff: chrome/renderer/net/net_error_helper_core_unittest.cc

Issue 630603003: Replacing the OVERRIDE with override in chrome/renderer (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 | « chrome/renderer/net/net_error_helper.h ('k') | chrome/renderer/net/net_error_page_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/net/net_error_helper_core_unittest.cc
diff --git a/chrome/renderer/net/net_error_helper_core_unittest.cc b/chrome/renderer/net/net_error_helper_core_unittest.cc
index 3ff1deeca074cf1b8ac48d24ce2b506df8e56665..4ab23493ee959824298941e9548e23211e944845 100644
--- a/chrome/renderer/net/net_error_helper_core_unittest.cc
+++ b/chrome/renderer/net/net_error_helper_core_unittest.cc
@@ -161,7 +161,7 @@ class NetErrorHelperCoreTest : public testing::Test,
EXPECT_FALSE(is_url_being_fetched());
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
base::StatisticsRecorder::Initialize();
}
@@ -299,7 +299,7 @@ class NetErrorHelperCoreTest : public testing::Test,
scoped_ptr<LocalizedError::ErrorPageParams> params,
bool* reload_button_shown,
bool* load_stale_button_shown,
- std::string* html) const OVERRIDE {
+ std::string* html) const override {
last_error_page_params_.reset(params.release());
*reload_button_shown = false;
*load_stale_button_shown = false;
@@ -307,17 +307,17 @@ class NetErrorHelperCoreTest : public testing::Test,
}
virtual void LoadErrorPageInMainFrame(const std::string& html,
- const GURL& failed_url) OVERRIDE {
+ const GURL& failed_url) override {
error_html_update_count_++;
last_error_html_ = html;
}
- virtual void EnablePageHelperFunctions() OVERRIDE {
+ virtual void EnablePageHelperFunctions() override {
enable_page_helper_functions_count_++;
}
virtual void UpdateErrorPage(const WebURLError& error,
- bool is_failed_post) OVERRIDE {
+ bool is_failed_post) override {
update_count_++;
last_error_page_params_.reset(NULL);
last_error_html_ = ErrorToString(error, is_failed_post);
@@ -325,7 +325,7 @@ class NetErrorHelperCoreTest : public testing::Test,
virtual void FetchNavigationCorrections(
const GURL& navigation_correction_url,
- const std::string& navigation_correction_request_body) OVERRIDE {
+ const std::string& navigation_correction_request_body) override {
EXPECT_TRUE(url_being_fetched_.is_empty());
EXPECT_TRUE(request_body_.empty());
EXPECT_EQ(GURL(kNavigationCorrectionUrl), navigation_correction_url);
@@ -348,23 +348,23 @@ class NetErrorHelperCoreTest : public testing::Test,
EXPECT_TRUE(StringValueEquals(*dict, "params.key", kApiKey));
}
- virtual void CancelFetchNavigationCorrections() OVERRIDE {
+ virtual void CancelFetchNavigationCorrections() override {
url_being_fetched_ = GURL();
request_body_.clear();
}
- virtual void ReloadPage() OVERRIDE {
+ virtual void ReloadPage() override {
reload_count_++;
}
- virtual void LoadPageFromCache(const GURL& error_url) OVERRIDE {
+ virtual void LoadPageFromCache(const GURL& error_url) override {
load_stale_count_++;
load_stale_url_ = error_url;
}
virtual void SendTrackingRequest(
const GURL& tracking_url,
- const std::string& tracking_request_body) OVERRIDE {
+ const std::string& tracking_request_body) override {
last_tracking_url_ = tracking_url;
last_tracking_request_body_ = tracking_request_body;
tracking_request_count_++;
@@ -2233,7 +2233,7 @@ TEST_F(NetErrorHelperCoreAutoReloadTest, ShownWhileNotReloading) {
class NetErrorHelperCoreHistogramTest
: public NetErrorHelperCoreAutoReloadTest {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
NetErrorHelperCoreAutoReloadTest::SetUp();
}
« no previous file with comments | « chrome/renderer/net/net_error_helper.h ('k') | chrome/renderer/net/net_error_page_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698