summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 04:23:15 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 04:23:15 +0000
commite6ed7a5decad0946cce877b6dba245b6d7a94c89 (patch)
treefdc1825762d67a4a753315d9c865eb9ba3f474d8 /chrome_frame
parent37ca266fcad9975f2b34b4824e460b21888f5da7 (diff)
downloadchromium_src-e6ed7a5decad0946cce877b6dba245b6d7a94c89.zip
chromium_src-e6ed7a5decad0946cce877b6dba245b6d7a94c89.tar.gz
chromium_src-e6ed7a5decad0946cce877b6dba245b6d7a94c89.tar.bz2
Delete UrlmonUrlRequest static object counter since we may have multiple UrlmonUrlRequestManager objects in a single process.
Review URL: http://codereview.chromium.org/563027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/urlmon_url_request.cc9
-rw-r--r--chrome_frame/urlmon_url_request_private.h1
2 files changed, 2 insertions, 8 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index b08be33..c03b3f0 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -35,19 +35,15 @@ STDMETHODIMP UrlmonUrlRequest::SendStream::Write(const void * buffer,
return S_OK;
}
-int UrlmonUrlRequest::instance_count_ = 0;
-
UrlmonUrlRequest::UrlmonUrlRequest()
: pending_read_size_(0),
thread_(NULL),
parent_window_(NULL) {
- DLOG(INFO) << StringPrintf("Created request. Obj: %X", this)
- << " Count: " << ++instance_count_;
+ DLOG(INFO) << StringPrintf("Created request. Obj: %X", this);
}
UrlmonUrlRequest::~UrlmonUrlRequest() {
- DLOG(INFO) << StringPrintf("Deleted request. Obj: %X", this)
- << " Count: " << --instance_count_;
+ DLOG(INFO) << StringPrintf("Deleted request. Obj: %X", this);
}
bool UrlmonUrlRequest::Start() {
@@ -952,7 +948,6 @@ void UrlmonUrlRequestManager::StopAll() {
worker_thread_access_.Acquire();
worker_thread_.Stop();
worker_thread_access_.Release();
- DCHECK_EQ(0, UrlmonUrlRequest::instance_count_);
}
void UrlmonUrlRequestManager::StopAllWorker() {
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index 3434ed7..7d95486 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.h
@@ -23,7 +23,6 @@ class UrlmonUrlRequest
public IAuthenticate,
public IHttpSecurity {
public:
- static int instance_count_;
virtual bool Start();
virtual void Stop();
virtual bool Read(int bytes_to_read);