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

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

Issue 2945004: Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionError start... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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
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/single_threaded_proxy_resolver.h" 5 #include "net/proxy/single_threaded_proxy_resolver.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/thread.h" 8 #include "base/thread.h"
9 #include "net/base/capturing_net_log.h" 9 #include "net/base/capturing_net_log.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 ProcessPendingJobs(); 344 ProcessPendingJobs();
345 } 345 }
346 346
347 void SingleThreadedProxyResolver::RemoveOutstandingSetPacScriptTask( 347 void SingleThreadedProxyResolver::RemoveOutstandingSetPacScriptTask(
348 SetPacScriptTask* task) { 348 SetPacScriptTask* task) {
349 DCHECK_EQ(outstanding_set_pac_script_task_.get(), task); 349 DCHECK_EQ(outstanding_set_pac_script_task_.get(), task);
350 outstanding_set_pac_script_task_ = NULL; 350 outstanding_set_pac_script_task_ = NULL;
351 } 351 }
352 352
353 } // namespace net 353 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/single_threaded_proxy_resolver.h ('k') | net/proxy/single_threaded_proxy_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698