diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 12:31:42 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 12:31:42 +0000 |
| commit | 9b59a69ff861f502b0cb17e0f2f990f068677ce5 (patch) | |
| tree | 080acf949b2a4ccac2a1897e7922443bf90bc4a3 /content/browser/debugger/devtools_netlog_observer.cc | |
| parent | 182fd8b0ab754bb2ce25a7cd77d05537718da4f2 (diff) | |
| download | chromium_src-9b59a69ff861f502b0cb17e0f2f990f068677ce5.zip chromium_src-9b59a69ff861f502b0cb17e0f2f990f068677ce5.tar.gz chromium_src-9b59a69ff861f502b0cb17e0f2f990f068677ce5.tar.bz2 | |
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
Diffstat (limited to 'content/browser/debugger/devtools_netlog_observer.cc')
| -rw-r--r-- | content/browser/debugger/devtools_netlog_observer.cc | 13 |
1 files changed, 7 insertions, 6 deletions
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() { |