replace OVERRIDE and FINAL with override and final in net/

net/proxy/proxy_config_service_android_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_android.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 class TestObserver : public ProxyConfigService::Observer {
  public:
   TestObserver() : availability_(ProxyConfigService::CONFIG_UNSET) {}
 
   // ProxyConfigService::Observer:
   virtual void OnProxyConfigChanged(
       const ProxyConfig& config,
-      ProxyConfigService::ConfigAvailability availability) OVERRIDE {
+      ProxyConfigService::ConfigAvailability availability) override {
     config_ = config;
     availability_ = availability;
   }
 
   ProxyConfigService::ConfigAvailability availability() const {
     return availability_;
   }
 
   const ProxyConfig& config() const {
     return config_;
@@ skipping 16 matching lines @@
       : configuration_(initial_configuration),
         message_loop_(base::MessageLoop::current()),
         service_(message_loop_->message_loop_proxy(),
                  message_loop_->message_loop_proxy(),
                  base::Bind(&ProxyConfigServiceAndroidTestBase::GetProperty,
                             base::Unretained(this))) {}
 
   virtual ~ProxyConfigServiceAndroidTestBase() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_->RunUntilIdle();
     service_.AddObserver(&observer_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     service_.RemoveObserver(&observer_);
   }
 
   void ClearConfiguration() {
     configuration_.clear();
   }
 
   void AddProperty(const std::string& key, const std::string& value) {
     configuration_[key] = value;
   }
@@ skipping 262 matching lines @@
 TEST_F(ProxyConfigServiceAndroidTest, HttpProxySupercedesSocks) {
   // SOCKS proxy is ignored if default HTTP proxy defined.
   AddProperty("proxyHost", "defaultproxy.com");
   AddProperty("socksProxyHost", "socksproxy.com");
   AddProperty("socksProxyPort", "9000");
   ProxySettingsChanged();
   TestMapping("http://example.com/", "PROXY defaultproxy.com:80");
 }
 
 }  // namespace net