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

Side by Side Diff: net/proxy/proxy_service_mojo_unittest.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/proxy/proxy_service_mojo.h" 5 #include "net/proxy/proxy_service_mojo.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "net/base/network_delegate_impl.h" 16 #include "net/base/network_delegate_impl.h"
17 #include "net/base/test_completion_callback.h" 17 #include "net/base/test_completion_callback.h"
18 #include "net/dns/mock_host_resolver.h" 18 #include "net/dns/mock_host_resolver.h"
19 #include "net/log/net_log.h"
20 #include "net/log/net_log_event_type.h" 19 #include "net/log/net_log_event_type.h"
20 #include "net/log/net_log_with_source.h"
21 #include "net/log/test_net_log.h" 21 #include "net/log/test_net_log.h"
22 #include "net/log/test_net_log_entry.h" 22 #include "net/log/test_net_log_entry.h"
23 #include "net/proxy/dhcp_proxy_script_fetcher.h" 23 #include "net/proxy/dhcp_proxy_script_fetcher.h"
24 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h" 24 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h"
25 #include "net/proxy/mock_proxy_script_fetcher.h" 25 #include "net/proxy/mock_proxy_script_fetcher.h"
26 #include "net/proxy/mojo_proxy_resolver_factory.h" 26 #include "net/proxy/mojo_proxy_resolver_factory.h"
27 #include "net/proxy/proxy_config_service_fixed.h" 27 #include "net/proxy/proxy_config_service_fixed.h"
28 #include "net/proxy/proxy_service.h" 28 #include "net/proxy/proxy_service.h"
29 #include "net/test/event_waiter.h" 29 #include "net/test/event_waiter.h"
30 #include "net/test/gtest_util.h" 30 #include "net/test/gtest_util.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 EXPECT_THAT(callback.WaitForResult(), IsOk()); 258 EXPECT_THAT(callback.WaitForResult(), IsOk());
259 EXPECT_EQ("DIRECT", info.ToPacString()); 259 EXPECT_EQ("DIRECT", info.ToPacString());
260 EXPECT_EQ(0u, mock_host_resolver_.num_resolve()); 260 EXPECT_EQ(0u, mock_host_resolver_.num_resolve());
261 261
262 TestNetLogEntry::List entries; 262 TestNetLogEntry::List entries;
263 net_log_.GetEntries(&entries); 263 net_log_.GetEntries(&entries);
264 CheckCapturedNetLogEntries(entries); 264 CheckCapturedNetLogEntries(entries);
265 } 265 }
266 266
267 } // namespace net 267 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698