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

Side by Side Diff: chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 26 matching lines...) Expand all
37 void SetProxyConfig(const net::ProxyConfig config, 37 void SetProxyConfig(const net::ProxyConfig config,
38 ConfigAvailability availability) { 38 ConfigAvailability availability) {
39 config_ = config; 39 config_ = config;
40 availability_ = availability; 40 availability_ = availability;
41 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_, 41 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_,
42 OnProxyConfigChanged(config, availability)); 42 OnProxyConfigChanged(config, availability));
43 } 43 }
44 44
45 private: 45 private:
46 virtual void AddObserver( 46 virtual void AddObserver(
47 net::ProxyConfigService::Observer* observer) OVERRIDE { 47 net::ProxyConfigService::Observer* observer) override {
48 observers_.AddObserver(observer); 48 observers_.AddObserver(observer);
49 } 49 }
50 50
51 virtual void RemoveObserver( 51 virtual void RemoveObserver(
52 net::ProxyConfigService::Observer* observer) OVERRIDE { 52 net::ProxyConfigService::Observer* observer) override {
53 observers_.RemoveObserver(observer); 53 observers_.RemoveObserver(observer);
54 } 54 }
55 55
56 virtual net::ProxyConfigService::ConfigAvailability GetLatestProxyConfig( 56 virtual net::ProxyConfigService::ConfigAvailability GetLatestProxyConfig(
57 net::ProxyConfig* config) OVERRIDE { 57 net::ProxyConfig* config) override {
58 *config = config_; 58 *config = config_;
59 return availability_; 59 return availability_;
60 } 60 }
61 61
62 net::ProxyConfig config_; 62 net::ProxyConfig config_;
63 ConfigAvailability availability_; 63 ConfigAvailability availability_;
64 ObserverList<net::ProxyConfigService::Observer, true> observers_; 64 ObserverList<net::ProxyConfigService::Observer, true> observers_;
65 }; 65 };
66 66
67 // A mock observer for capturing callbacks. 67 // A mock observer for capturing callbacks.
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 net::ProxyRulesExpectation::Empty(), 475 net::ProxyRulesExpectation::Empty(),
476 }, 476 },
477 }; 477 };
478 478
479 INSTANTIATE_TEST_CASE_P( 479 INSTANTIATE_TEST_CASE_P(
480 PrefProxyConfigTrackerImplCommandLineTestInstance, 480 PrefProxyConfigTrackerImplCommandLineTestInstance,
481 PrefProxyConfigTrackerImplCommandLineTest, 481 PrefProxyConfigTrackerImplCommandLineTest,
482 testing::ValuesIn(kCommandLineTestParams)); 482 testing::ValuesIn(kCommandLineTestParams));
483 483
484 } // namespace 484 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/net/pref_proxy_config_tracker_impl.h ('k') | chrome/browser/net/proxy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698