From 9b59a69ff861f502b0cb17e0f2f990f068677ce5 Mon Sep 17 00:00:00 2001
From: "pfeldman@chromium.org"
<pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 26 Jan 2012 12:31:42 +0000
Subject: DevTools: refactor remote debugging server to enable content_shell
debugging.
BUG=97465
TEST=
Review URL: https://chromiumcodereview.appspot.com/9113079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119230 0039d316-1c4b-4281-b951-d872f2087c98
---
content/browser/debugger/devtools_netlog_observer.cc | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'content/browser/debugger/devtools_netlog_observer.cc')
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc
index 98492b2..a563a8d 100644
--- a/content/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/debugger/devtools_netlog_observer.cc
@@ -240,17 +240,18 @@ void DevToolsNetLogObserver::OnAddSocketEntry(
void DevToolsNetLogObserver::Attach() {
DCHECK(!instance_);
-
- instance_ = new DevToolsNetLogObserver(
- content::GetContentClient()->browser()->GetNetLog());
+ net::NetLog* net_log = content::GetContentClient()->browser()->GetNetLog();
+ if (net_log)
+ instance_ = new DevToolsNetLogObserver(net_log);
}
void DevToolsNetLogObserver::Detach() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- DCHECK(instance_);
- delete instance_;
- instance_ = NULL;
+ if (instance_) {
+ delete instance_;
+ instance_ = NULL;
+ }
}
DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() {
--
cgit v1.1