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

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

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_config_service_win.cc ('k') | net/socket/nss_ssl_util.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/sync_host_resolver_bridge.h" 5 #include "net/proxy/sync_host_resolver_bridge.h"
6 6
7 #include "base/thread.h" 7 #include "base/threading/thread.h"
8 #include "base/waitable_event.h" 8 #include "base/waitable_event.h"
9 #include "net/base/address_list.h" 9 #include "net/base/address_list.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
11 #include "net/base/net_log.h" 11 #include "net/base/net_log.h"
12 #include "net/proxy/multi_threaded_proxy_resolver.h" 12 #include "net/proxy/multi_threaded_proxy_resolver.h"
13 #include "net/base/test_completion_callback.h" 13 #include "net/base/test_completion_callback.h"
14 #include "net/proxy/proxy_info.h" 14 #include "net/proxy/proxy_info.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 // TODO(eroman): This test should be moved into 17 // TODO(eroman): This test should be moved into
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // stop the IOThread, which will in turn delete the 225 // stop the IOThread, which will in turn delete the
226 // SingleThreadedProxyResolver, which in turn will stop its internal 226 // SingleThreadedProxyResolver, which in turn will stop its internal
227 // PAC thread (which is currently blocked waiting on the host resolve which 227 // PAC thread (which is currently blocked waiting on the host resolve which
228 // is running on IOThread). The IOThread::Cleanup() will verify that after 228 // is running on IOThread). The IOThread::Cleanup() will verify that after
229 // the PAC thread is stopped, it cancels the request on the HostResolver. 229 // the PAC thread is stopped, it cancels the request on the HostResolver.
230 } 230 }
231 231
232 } // namespace 232 } // namespace
233 233
234 } // namespace net 234 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_win.cc ('k') | net/socket/nss_ssl_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698