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

Side by Side Diff: chrome_frame/urlmon_url_request.cc

Issue 8564026: Remove a DCHECK on stopping_ from StartRequestHelper. Since StartRequestHelper is now called on a... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « no previous file | no next file » | 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) 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 "chrome_frame/urlmon_url_request.h" 5 #include "chrome_frame/urlmon_url_request.h"
6 6
7 #include <urlmon.h> 7 #include <urlmon.h>
8 #include <wininet.h> 8 #include <wininet.h>
9 9
10 #include "base/callback_old.h" 10 #include "base/callback_old.h"
(...skipping 1016 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 } 1027 }
1028 StartRequestHelper(request_id, request_info, &request_map_, NULL); 1028 StartRequestHelper(request_id, request_info, &request_map_, NULL);
1029 } 1029 }
1030 1030
1031 void UrlmonUrlRequestManager::StartRequestHelper( 1031 void UrlmonUrlRequestManager::StartRequestHelper(
1032 int request_id, 1032 int request_id,
1033 const AutomationURLRequest& request_info, 1033 const AutomationURLRequest& request_info,
1034 RequestMap* request_map, 1034 RequestMap* request_map,
1035 base::Lock* request_map_lock) { 1035 base::Lock* request_map_lock) {
1036 DCHECK(request_map); 1036 DCHECK(request_map);
1037 DCHECK(!stopping_);
1038 scoped_refptr<UrlmonUrlRequest> new_request; 1037 scoped_refptr<UrlmonUrlRequest> new_request;
1039 bool is_started = false; 1038 bool is_started = false;
1040 if (pending_request_) { 1039 if (pending_request_) {
1041 if (pending_request_->url() != request_info.url) { 1040 if (pending_request_->url() != request_info.url) {
1042 DLOG(INFO) << __FUNCTION__ 1041 DLOG(INFO) << __FUNCTION__
1043 << "Received url request for url:" 1042 << "Received url request for url:"
1044 << request_info.url 1043 << request_info.url
1045 << ". Stopping pending url request for url:" 1044 << ". Stopping pending url request for url:"
1046 << pending_request_->url(); 1045 << pending_request_->url();
1047 pending_request_->Stop(); 1046 pending_request_->Stop();
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 } 1416 }
1418 1417
1419 void UrlmonUrlRequestManager::ResourceFetcherThread::Init() { 1418 void UrlmonUrlRequestManager::ResourceFetcherThread::Init() {
1420 CoInitialize(NULL); 1419 CoInitialize(NULL);
1421 } 1420 }
1422 1421
1423 void UrlmonUrlRequestManager::ResourceFetcherThread::CleanUp() { 1422 void UrlmonUrlRequestManager::ResourceFetcherThread::CleanUp() {
1424 CoUninitialize(); 1423 CoUninitialize();
1425 } 1424 }
1426 1425
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698