diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 10:19:21 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 10:19:21 +0000 |
| commit | 66383182929cff97086cf9b9f94d6c93134dbbef (patch) | |
| tree | 837e2ccd3a5255bafd0ce58cca32fba1586d8572 /chrome/browser/browser_process_impl.h | |
| parent | 6a5cbbb861a3907403459541ec5255bca9f450e5 (diff) | |
| download | chromium_src-66383182929cff97086cf9b9f94d6c93134dbbef.zip chromium_src-66383182929cff97086cf9b9f94d6c93134dbbef.tar.gz chromium_src-66383182929cff97086cf9b9f94d6c93134dbbef.tar.bz2 | |
Fix crash in policy code caused by early shutdown.
BUG=128328,127396
TEST=Starting chrome with --try-chrome-again=10001 doesn't crash in policy code anymore
Review URL: https://chromiumcodereview.appspot.com/10388211
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
| -rw-r--r-- | chrome/browser/browser_process_impl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 425cecc..101fe84 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -154,6 +154,11 @@ class BrowserProcessImpl : public BrowserProcess, bool created_watchdog_thread_; scoped_ptr<WatchDogThread> watchdog_thread_; + // Must be destroyed after |policy_service_| if StartTearDown() isn't invoked + // during an early shutdown. + bool created_browser_policy_connector_; + scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_; + // Must be destroyed after |local_state_|. scoped_ptr<policy::PolicyService> policy_service_; @@ -171,9 +176,6 @@ class BrowserProcessImpl : public BrowserProcess, scoped_ptr<RemoteDebuggingServer> remote_debugging_server_; - bool created_browser_policy_connector_; - scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_; - scoped_refptr<printing::PrintPreviewTabController> print_preview_tab_controller_; |