Commit 16116801 authored by viettrungluu's avatar viettrungluu Committed by Commit bot

Delete the last remaining use of OVERRIDE and remove its definition.

TBR=dominich@chromium.org,thestig@chromium.org
BUG=417463

Review URL: https://codereview.chromium.org/666563003

Cr-Commit-Position: refs/heads/master@{#300642}
parent 070cfe61
...@@ -139,12 +139,6 @@ ...@@ -139,12 +139,6 @@
#define ALIGNOF(type) __alignof__(type) #define ALIGNOF(type) __alignof__(type)
#endif #endif
// Annotate a virtual method indicating it must be overriding a virtual
// method in the parent class.
// Use like:
// virtual void foo() OVERRIDE;
#define OVERRIDE override
// Annotate a function indicating the caller must examine the return value. // Annotate a function indicating the caller must examine the return value.
// Use like: // Use like:
// int foo() WARN_UNUSED_RESULT; // int foo() WARN_UNUSED_RESULT;
......
...@@ -27,14 +27,14 @@ namespace { ...@@ -27,14 +27,14 @@ namespace {
class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier { class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier {
public: public:
ConnectionType GetCurrentConnectionType() const OVERRIDE { ConnectionType GetCurrentConnectionType() const override {
return NetworkChangeNotifier::CONNECTION_WIFI; return NetworkChangeNotifier::CONNECTION_WIFI;
} }
}; };
class MockNetworkChangeNotifier4G : public NetworkChangeNotifier { class MockNetworkChangeNotifier4G : public NetworkChangeNotifier {
public: public:
ConnectionType GetCurrentConnectionType() const OVERRIDE { ConnectionType GetCurrentConnectionType() const override {
return NetworkChangeNotifier::CONNECTION_4G; return NetworkChangeNotifier::CONNECTION_4G;
} }
}; };
...@@ -46,7 +46,7 @@ namespace predictors { ...@@ -46,7 +46,7 @@ namespace predictors {
class ResourcePrefetchCommonTest : public testing::Test { class ResourcePrefetchCommonTest : public testing::Test {
public: public:
ResourcePrefetchCommonTest(); ResourcePrefetchCommonTest();
virtual void SetUp() OVERRIDE; void SetUp() override;
void CreateTestFieldTrial(const std::string& name, void CreateTestFieldTrial(const std::string& name,
const std::string& group_name) { const std::string& group_name) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment