| Index: extensions/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
|
| index bc5ac7c96865315c3ffe7e3d43e21ac0ef7af51c..e1df8f712cf87ecfb5a4b926fc6635f49880e97a 100644
|
| --- a/extensions/shell/browser/shell_browser_main_parts.cc
|
| +++ b/extensions/shell/browser/shell_browser_main_parts.cc
|
| @@ -29,6 +29,10 @@
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| +#include "components/storage_monitor/storage_monitor.h"
|
| +#endif
|
| +
|
| #if defined(OS_CHROMEOS)
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| @@ -101,6 +105,10 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
|
|
| aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
|
|
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| + storage_monitor::StorageMonitor::Create();
|
| +#endif
|
| +
|
| desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
|
|
|
| // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
|
| @@ -176,6 +184,10 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
|
| browser_context_.reset();
|
|
|
| desktop_controller_.reset();
|
| +
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| + storage_monitor::StorageMonitor::Destroy();
|
| +#endif
|
| }
|
|
|
| void ShellBrowserMainParts::PostDestroyThreads() {
|
|
|