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

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

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Oops Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/threading/thread.h" 7 #include "base/threading/thread.h"
8 #include "base/synchronization/waitable_event.h" 8 #include "base/synchronization/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"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 EXPECT_EQ(ERR_ABORTED, rv); 105 EXPECT_EQ(ERR_ABORTED, rv);
106 106
107 return rv; 107 return rv;
108 } 108 }
109 109
110 virtual void CancelRequest(RequestHandle request) OVERRIDE { 110 virtual void CancelRequest(RequestHandle request) OVERRIDE {
111 NOTREACHED(); 111 NOTREACHED();
112 } 112 }
113 113
114 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
115 NOTREACHED();
116 return LOAD_STATE_IDLE;
117 }
118
114 virtual void Shutdown() OVERRIDE { 119 virtual void Shutdown() OVERRIDE {
115 host_resolver_->Shutdown(); 120 host_resolver_->Shutdown();
116 } 121 }
117 122
118 virtual void CancelSetPacScript() OVERRIDE { 123 virtual void CancelSetPacScript() OVERRIDE {
119 NOTREACHED(); 124 NOTREACHED();
120 } 125 }
121 126
122 virtual int SetPacScript( 127 virtual int SetPacScript(
123 const scoped_refptr<ProxyResolverScriptData>& script_data, 128 const scoped_refptr<ProxyResolverScriptData>& script_data,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // stop the IOThread, which will in turn delete the 236 // stop the IOThread, which will in turn delete the
232 // SingleThreadedProxyResolver, which in turn will stop its internal 237 // SingleThreadedProxyResolver, which in turn will stop its internal
233 // PAC thread (which is currently blocked waiting on the host resolve which 238 // PAC thread (which is currently blocked waiting on the host resolve which
234 // is running on IOThread). The IOThread::Cleanup() will verify that after 239 // is running on IOThread). The IOThread::Cleanup() will verify that after
235 // the PAC thread is stopped, it cancels the request on the HostResolver. 240 // the PAC thread is stopped, it cancels the request on the HostResolver.
236 } 241 }
237 242
238 } // namespace 243 } // namespace
239 244
240 } // namespace net 245 } // namespace net
OLDNEW
« chrome/app/generated_resources.grd ('K') | « net/proxy/proxy_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698