diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 13:10:41 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 13:10:41 +0000 |
| commit | 4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1 (patch) | |
| tree | 42c1c1fc46e44813c71c7611e1acac1b524b1090 /content/browser/debugger/devtools_netlog_observer.cc | |
| parent | 9b59a69ff861f502b0cb17e0f2f990f068677ce5 (diff) | |
| download | chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.zip chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.tar.gz chromium_src-4cc1c1f9a9d19b5988dc01ac4e6fc693b0e03ec1.tar.bz2 | |
This reverts r119230 that broke few builders.
TBR=yurys
Review URL: https://chromiumcodereview.appspot.com/9234061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger/devtools_netlog_observer.cc')
| -rw-r--r-- | content/browser/debugger/devtools_netlog_observer.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc index a563a8d..98492b2 100644 --- a/content/browser/debugger/devtools_netlog_observer.cc +++ b/content/browser/debugger/devtools_netlog_observer.cc @@ -240,18 +240,17 @@ void DevToolsNetLogObserver::OnAddSocketEntry( void DevToolsNetLogObserver::Attach() { DCHECK(!instance_); - net::NetLog* net_log = content::GetContentClient()->browser()->GetNetLog(); - if (net_log) - instance_ = new DevToolsNetLogObserver(net_log); + + instance_ = new DevToolsNetLogObserver( + content::GetContentClient()->browser()->GetNetLog()); } void DevToolsNetLogObserver::Detach() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK(instance_); - if (instance_) { - delete instance_; - instance_ = NULL; - } + delete instance_; + instance_ = NULL; } DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() { |