| Index: chrome/browser/browser_process_impl.cc
|
| ===================================================================
|
| --- chrome/browser/browser_process_impl.cc (revision 100929)
|
| +++ chrome/browser/browser_process_impl.cc (working copy)
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/browser/automation/automation_provider_list.h"
|
| #include "chrome/browser/background/background_mode_manager.h"
|
| #include "chrome/browser/chrome_browser_main.h"
|
| -#include "chrome/browser/browser_process_sub_thread.h"
|
| #include "chrome/browser/browser_trial.h"
|
| #include "chrome/browser/chrome_plugin_service_filter.h"
|
| #include "chrome/browser/component_updater/component_updater_configurator.h"
|
| @@ -68,6 +67,7 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/installer/util/google_update_constants.h"
|
| #include "content/browser/browser_child_process_host.h"
|
| +#include "content/browser/browser_process_sub_thread.h"
|
| #include "content/browser/browser_thread.h"
|
| #include "content/browser/child_process_security_policy.h"
|
| #include "content/browser/debugger/devtools_manager.h"
|
| @@ -140,7 +140,6 @@
|
| using_new_frames_(false) {
|
| g_browser_process = this;
|
| clipboard_.reset(new ui::Clipboard);
|
| - main_notification_service_.reset(new NotificationService);
|
|
|
| // Must be created after the NotificationService.
|
| print_job_manager_.reset(new printing::PrintJobManager);
|
| @@ -274,9 +273,6 @@
|
| // former registers for notifications.
|
| tab_closeable_state_watcher_.reset();
|
|
|
| - // Now OK to destroy NotificationService.
|
| - main_notification_service_.reset();
|
| -
|
| g_browser_process = NULL;
|
| }
|
|
|
| @@ -309,8 +305,6 @@
|
| io_thread()->message_loop()->PostTask(
|
| FROM_HERE,
|
| NewRunnableFunction(&base::ThreadRestrictions::SetIOAllowed, true));
|
| - MessageLoop::current()->PostTask(
|
| - FROM_HERE, NewRunnableFunction(content::DidEndMainMessageLoop));
|
| MessageLoop::current()->Quit();
|
| }
|
| return module_ref_count_;
|
|
|