diff options
| author | dgozman <dgozman@chromium.org> | 2015-05-21 13:27:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-21 20:27:54 +0000 |
| commit | b1d32785299dc8c96f79e4ea0dd212955dc6b537 (patch) | |
| tree | 44e545ce15e2813b7f22ec4474713f015cbb1256 /chrome/browser/browser_process_impl.cc | |
| parent | 7eb461dad565664324a4c71a57425baf759b44ff (diff) | |
| download | chromium_src-b1d32785299dc8c96f79e4ea0dd212955dc6b537.zip chromium_src-b1d32785299dc8c96f79e4ea0dd212955dc6b537.tar.gz chromium_src-b1d32785299dc8c96f79e4ea0dd212955dc6b537.tar.bz2 | |
[DevTools] Destroy RemoteDebuggingServer before ProfileManager.
BUG=487719
Review URL: https://codereview.chromium.org/1132873010
Cr-Commit-Position: refs/heads/master@{#330961}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 863c96a..2b060c1 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -259,6 +259,11 @@ void BrowserProcessImpl::StartTearDown() { // needs to be shut down before the ProfileManager. supervised_user_whitelist_installer_.reset(); +#if !defined(OS_ANDROID) + // Debugger must be cleaned up before ProfileManager. + remote_debugging_server_.reset(); +#endif + // Need to clear profiles (download managers) before the io_thread_. { TRACE_EVENT0("shutdown", @@ -276,11 +281,6 @@ void BrowserProcessImpl::StartTearDown() { child_process_watcher_.reset(); -#if !defined(OS_ANDROID) - // Debugger must be cleaned up before IO thread and NotificationService. - remote_debugging_server_.reset(); -#endif - #if defined(ENABLE_EXTENSIONS) ExtensionRendererState::GetInstance()->Shutdown(); |