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

Side by Side Diff: net/ssl/ssl_config_service_unittest.cc

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/ssl/ssl_config_service.h" 5 #include "net/ssl/ssl_config_service.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace net { 13 namespace net {
14 14
15 namespace { 15 namespace {
16 16
17 class MockSSLConfigService : public SSLConfigService { 17 class MockSSLConfigService : public SSLConfigService {
18 public: 18 public:
19 explicit MockSSLConfigService(const SSLConfig& config) : config_(config) {} 19 explicit MockSSLConfigService(const SSLConfig& config) : config_(config) {}
20 20
21 // SSLConfigService implementation 21 // SSLConfigService implementation
22 virtual void GetSSLConfig(SSLConfig* config) OVERRIDE { 22 virtual void GetSSLConfig(SSLConfig* config) override {
23 *config = config_; 23 *config = config_;
24 } 24 }
25 25
26 // Sets the SSLConfig to be returned by GetSSLConfig and processes any 26 // Sets the SSLConfig to be returned by GetSSLConfig and processes any
27 // updates. 27 // updates.
28 void SetSSLConfig(const SSLConfig& config) { 28 void SetSSLConfig(const SSLConfig& config) {
29 SSLConfig old_config = config_; 29 SSLConfig old_config = config_;
30 config_ = config; 30 config_ = config;
31 ProcessConfigUpdate(old_config, config_); 31 ProcessConfigUpdate(old_config, config_);
32 } 32 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // cipher suites disabled, triggers an update. 115 // cipher suites disabled, triggers an update.
116 disabled_ciphers.pop_back(); 116 disabled_ciphers.pop_back();
117 initial_config.disabled_cipher_suites = disabled_ciphers; 117 initial_config.disabled_cipher_suites = disabled_ciphers;
118 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1); 118 EXPECT_CALL(observer, OnSSLConfigChanged()).Times(1);
119 mock_service->SetSSLConfig(initial_config); 119 mock_service->SetSSLConfig(initial_config);
120 120
121 mock_service->RemoveObserver(&observer); 121 mock_service->RemoveObserver(&observer);
122 } 122 }
123 123
124 } // namespace net 124 } // namespace net
OLDNEW
« no previous file with comments | « net/ssl/ssl_config_service_defaults.h ('k') | net/test/embedded_test_server/embedded_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698