| OLD | NEW |
| 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 <stddef.h> |
| 5 #include <time.h> | 6 #include <time.h> |
| 6 | 7 |
| 7 #include <algorithm> | 8 #include <algorithm> |
| 8 #include <sstream> | 9 #include <sstream> |
| 9 #include <string> | 10 #include <string> |
| 10 | 11 |
| 11 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
| 14 #include "base/single_thread_task_runner.h" | 16 #include "base/single_thread_task_runner.h" |
| 15 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
| 16 #include "base/thread_task_runner_handle.h" | 18 #include "base/thread_task_runner_handle.h" |
| 17 #include "base/timer/timer.h" | 19 #include "base/timer/timer.h" |
| 18 #include "base/values.h" | 20 #include "base/values.h" |
| 21 #include "build/build_config.h" |
| 19 #include "chrome/browser/net/predictor.h" | 22 #include "chrome/browser/net/predictor.h" |
| 20 #include "chrome/browser/net/url_info.h" | 23 #include "chrome/browser/net/url_info.h" |
| 21 #include "components/network_hints/common/network_hints_common.h" | 24 #include "components/network_hints/common/network_hints_common.h" |
| 22 #include "content/public/test/test_browser_thread.h" | 25 #include "content/public/test/test_browser_thread.h" |
| 23 #include "net/base/address_list.h" | 26 #include "net/base/address_list.h" |
| 24 #include "net/base/load_flags.h" | 27 #include "net/base/load_flags.h" |
| 25 #include "net/base/net_errors.h" | 28 #include "net/base/net_errors.h" |
| 26 #include "net/base/winsock_init.h" | 29 #include "net/base/winsock_init.h" |
| 27 #include "net/dns/mock_host_resolver.h" | 30 #include "net/dns/mock_host_resolver.h" |
| 28 #include "net/http/transport_security_state.h" | 31 #include "net/http/transport_security_state.h" |
| (...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED); | 840 testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED); |
| 838 | 841 |
| 839 // Proxy may not be in use (the PAC script has not yet been evaluated), so the | 842 // Proxy may not be in use (the PAC script has not yet been evaluated), so the |
| 840 // name has been registered for pre-resolve. | 843 // name has been registered for pre-resolve. |
| 841 EXPECT_FALSE(testing_master.work_queue_.IsEmpty()); | 844 EXPECT_FALSE(testing_master.work_queue_.IsEmpty()); |
| 842 | 845 |
| 843 testing_master.Shutdown(); | 846 testing_master.Shutdown(); |
| 844 } | 847 } |
| 845 | 848 |
| 846 } // namespace chrome_browser_net | 849 } // namespace chrome_browser_net |
| OLD | NEW |