Regularize storage monitor creation in Windows.

chrome/browser/chrome_browser_main_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 181 matching lines @@
 void ChromeBrowserMainPartsWin::PreMainMessageLoopStart() {
   // installer_util references strings that are normally compiled into
   // setup.exe.  In Chrome, these strings are in the locale files.
   SetupInstallerUtilStrings();
 
   ChromeBrowserMainParts::PreMainMessageLoopStart();
   if (!parameters().ui_task) {
     // Make sure that we know how to handle exceptions from the message loop.
     InitializeWindowProcExceptions();
   }
-  storage_monitor_.reset(chrome::StorageMonitorWin::Create());
 }
 
 void ChromeBrowserMainPartsWin::PostMainMessageLoopStart() {
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
 
   if (base::win::IsTSFAwareRequired()) {
     // Create a TSF message filter for the message loop. MessageLoop takes
     // ownership of the filter.
     scoped_ptr<base::win::TextServicesMessageFilter> tsf_message_filter(
       new base::win::TextServicesMessageFilter);
     if (tsf_message_filter->Init()) {
       MessageLoopForUI::current()->SetMessageFilter(
         tsf_message_filter.PassAs<MessageLoopForUI::MessageFilter>());
     }
   }
 }
 
-void ChromeBrowserMainPartsWin::PreMainMessageLoopRun() {
-  ChromeBrowserMainParts::PreMainMessageLoopRun();
+void ChromeBrowserMainPartsWin::PreProfileInit() {
+  storage_monitor_.reset(chrome::StorageMonitorWin::Create());
 
+  ChromeBrowserMainParts::PreProfileInit();
+}
+
+void ChromeBrowserMainPartsWin::PostProfileInit() {
   storage_monitor_->Init();
+
+  ChromeBrowserMainParts::PostProfileInit();
 }
 
 void ChromeBrowserMainPartsWin::ShowMissingLocaleMessageBox() {
   ui::MessageBox(NULL, ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
                  ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
                  MB_OK | MB_ICONERROR | MB_TOPMOST);
 }
 
 // static
 void ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment(
@@ skipping 164 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }