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

Side by Side Diff: net/dns/host_resolver_impl_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 (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/dns/host_resolver_impl.h" 5 #include "net/dns/host_resolver_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <tuple> 10 #include <tuple>
(...skipping 16 matching lines...) Expand all
27 #include "base/threading/thread_task_runner_handle.h" 27 #include "base/threading/thread_task_runner_handle.h"
28 #include "base/time/time.h" 28 #include "base/time/time.h"
29 #include "net/base/address_list.h" 29 #include "net/base/address_list.h"
30 #include "net/base/ip_address.h" 30 #include "net/base/ip_address.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 #include "net/dns/dns_client.h" 32 #include "net/dns/dns_client.h"
33 #include "net/dns/dns_test_util.h" 33 #include "net/dns/dns_test_util.h"
34 #include "net/dns/mock_host_resolver.h" 34 #include "net/dns/mock_host_resolver.h"
35 #include "net/log/net_log_event_type.h" 35 #include "net/log/net_log_event_type.h"
36 #include "net/log/net_log_source_type.h" 36 #include "net/log/net_log_source_type.h"
37 #include "net/log/net_log_with_source.h"
37 #include "net/log/test_net_log.h" 38 #include "net/log/test_net_log.h"
38 #include "net/test/gtest_util.h" 39 #include "net/test/gtest_util.h"
39 #include "testing/gmock/include/gmock/gmock.h" 40 #include "testing/gmock/include/gmock/gmock.h"
40 #include "testing/gtest/include/gtest/gtest.h" 41 #include "testing/gtest/include/gtest/gtest.h"
41 42
42 using net::test::IsError; 43 using net::test::IsError;
43 using net::test::IsOk; 44 using net::test::IsOk;
44 45
45 namespace net { 46 namespace net {
46 47
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after
2455 EXPECT_EQ(1, count2); 2456 EXPECT_EQ(1, count2);
2456 2457
2457 // Make another request to make sure both callbacks were cleared. 2458 // Make another request to make sure both callbacks were cleared.
2458 req = CreateRequest("just.testing", 80); 2459 req = CreateRequest("just.testing", 80);
2459 EXPECT_THAT(req->Resolve(), IsOk()); 2460 EXPECT_THAT(req->Resolve(), IsOk());
2460 EXPECT_EQ(2, count1); 2461 EXPECT_EQ(2, count1);
2461 EXPECT_EQ(1, count2); 2462 EXPECT_EQ(1, count2);
2462 } 2463 }
2463 2464
2464 } // namespace net 2465 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698