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

Side by Side Diff: net/proxy/proxy_resolver_v8_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
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/base/net_log_unittest.h" 12 #include "net/base/net_log_unittest.h"
13 #include "net/proxy/proxy_info.h" 13 #include "net/proxy/proxy_info.h"
14 #include "net/proxy/proxy_resolver_v8.h" 14 #include "net/proxy/proxy_resolver_v8.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace net { 18 namespace net {
19 namespace { 19 namespace {
20 20
21 // Javascript bindings for ProxyResolverV8, which returns mock values. 21 // Javascript bindings for ProxyResolverV8, which returns mock values.
22 // Each time one of the bindings is called into, we push the input into a 22 // Each time one of the bindings is called into, we push the input into a
23 // list, for later verification. 23 // list, for later verification.
24 class MockJSBindings : public ProxyResolverV8::JSBindings { 24 class MockJSBindings : public ProxyResolverV8::JSBindings {
25 public: 25 public:
26 MockJSBindings() : my_ip_address_count(0), my_ip_address_ex_count(0), 26 MockJSBindings() : my_ip_address_count(0), my_ip_address_ex_count(0),
27 should_terminate(false) {} 27 should_terminate(false) {}
28 28
29 virtual void Alert(const base::string16& message) OVERRIDE { 29 virtual void Alert(const base::string16& message) override {
30 VLOG(1) << "PAC-alert: " << message; // Helpful when debugging. 30 VLOG(1) << "PAC-alert: " << message; // Helpful when debugging.
31 alerts.push_back(base::UTF16ToUTF8(message)); 31 alerts.push_back(base::UTF16ToUTF8(message));
32 } 32 }
33 33
34 virtual bool ResolveDns(const std::string& host, 34 virtual bool ResolveDns(const std::string& host,
35 ResolveDnsOperation op, 35 ResolveDnsOperation op,
36 std::string* output, 36 std::string* output,
37 bool* terminate) OVERRIDE { 37 bool* terminate) override {
38 *terminate = should_terminate; 38 *terminate = should_terminate;
39 39
40 if (op == MY_IP_ADDRESS) { 40 if (op == MY_IP_ADDRESS) {
41 my_ip_address_count++; 41 my_ip_address_count++;
42 *output = my_ip_address_result; 42 *output = my_ip_address_result;
43 return !my_ip_address_result.empty(); 43 return !my_ip_address_result.empty();
44 } 44 }
45 45
46 if (op == MY_IP_ADDRESS_EX) { 46 if (op == MY_IP_ADDRESS_EX) {
47 my_ip_address_ex_count++; 47 my_ip_address_ex_count++;
(...skipping 11 matching lines...) Expand all
59 dns_resolves_ex.push_back(host); 59 dns_resolves_ex.push_back(host);
60 *output = dns_resolve_ex_result; 60 *output = dns_resolve_ex_result;
61 return !dns_resolve_ex_result.empty(); 61 return !dns_resolve_ex_result.empty();
62 } 62 }
63 63
64 CHECK(false); 64 CHECK(false);
65 return false; 65 return false;
66 } 66 }
67 67
68 virtual void OnError(int line_number, 68 virtual void OnError(int line_number,
69 const base::string16& message) OVERRIDE { 69 const base::string16& message) override {
70 // Helpful when debugging. 70 // Helpful when debugging.
71 VLOG(1) << "PAC-error: [" << line_number << "] " << message; 71 VLOG(1) << "PAC-error: [" << line_number << "] " << message;
72 72
73 errors.push_back(base::UTF16ToUTF8(message)); 73 errors.push_back(base::UTF16ToUTF8(message));
74 errors_line_number.push_back(line_number); 74 errors_line_number.push_back(line_number);
75 } 75 }
76 76
77 // Mock values to return. 77 // Mock values to return.
78 std::string my_ip_address_result; 78 std::string my_ip_address_result;
79 std::string my_ip_address_ex_result; 79 std::string my_ip_address_ex_result;
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 GURL("http://kittens/"), &proxy_info, 618 GURL("http://kittens/"), &proxy_info,
619 CompletionCallback(), NULL, BoundNetLog()); 619 CompletionCallback(), NULL, BoundNetLog());
620 620
621 EXPECT_EQ(OK, result); 621 EXPECT_EQ(OK, result);
622 EXPECT_EQ(0u, bindings->errors.size()); 622 EXPECT_EQ(0u, bindings->errors.size());
623 EXPECT_EQ("kittens:88", proxy_info.proxy_server().ToURI()); 623 EXPECT_EQ("kittens:88", proxy_info.proxy_server().ToURI());
624 } 624 }
625 625
626 } // namespace 626 } // namespace
627 } // namespace net 627 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing_unittest.cc ('k') | net/proxy/proxy_resolver_winhttp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698