summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviettrungluu <viettrungluu@chromium.org>2014-10-21 23:46:14 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-22 06:46:45 +0000
commit161168015de91abe74ba7be393a12a63f99a0636 (patch)
treeadef1e5b54b499d9eefc4db3318ca88725b56d5c
parent070cfe614915394d0066c30ad7efb649b9a91ef6 (diff)
downloadchromium_src-161168015de91abe74ba7be393a12a63f99a0636.zip
chromium_src-161168015de91abe74ba7be393a12a63f99a0636.tar.gz
chromium_src-161168015de91abe74ba7be393a12a63f99a0636.tar.bz2
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}
-rw-r--r--base/compiler_specific.h6
-rw-r--r--chrome/browser/predictors/resource_prefetch_common_unittest.cc6
2 files changed, 3 insertions, 9 deletions
diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index 6210d1a..47ca977 100644
--- a/base/compiler_specific.h
+++ b/base/compiler_specific.h
@@ -139,12 +139,6 @@
#define ALIGNOF(type) __alignof__(type)
#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.
// Use like:
// int foo() WARN_UNUSED_RESULT;
diff --git a/chrome/browser/predictors/resource_prefetch_common_unittest.cc b/chrome/browser/predictors/resource_prefetch_common_unittest.cc
index 74033fb..61089d6 100644
--- a/chrome/browser/predictors/resource_prefetch_common_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetch_common_unittest.cc
@@ -27,14 +27,14 @@ namespace {
class MockNetworkChangeNotifierWIFI : public NetworkChangeNotifier {
public:
- ConnectionType GetCurrentConnectionType() const OVERRIDE {
+ ConnectionType GetCurrentConnectionType() const override {
return NetworkChangeNotifier::CONNECTION_WIFI;
}
};
class MockNetworkChangeNotifier4G : public NetworkChangeNotifier {
public:
- ConnectionType GetCurrentConnectionType() const OVERRIDE {
+ ConnectionType GetCurrentConnectionType() const override {
return NetworkChangeNotifier::CONNECTION_4G;
}
};
@@ -46,7 +46,7 @@ namespace predictors {
class ResourcePrefetchCommonTest : public testing::Test {
public:
ResourcePrefetchCommonTest();
- virtual void SetUp() OVERRIDE;
+ void SetUp() override;
void CreateTestFieldTrial(const std::string& name,
const std::string& group_name) {