Fix crash on startup because function returned before creating required

members.  Finnur fixed a similar crash about a month ago (crrev.com/116316),
so I added some DCHECK()s to help prevent this in the future.

BUG=110234
TEST=This may happen when ResourceBundle::InitSharedInstanceWithLocale()
returns an empty string.  Not sure if there are other scenarios that would
cause this crash.
Review URL: https://chromiumcodereview.appspot.com/9317095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120788 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main.cc

@@ -1111,6 +1111,9 @@ void ChromeBrowserMainParts::PostMainMessageLoopStart() {
 
 int ChromeBrowserMainParts::PreCreateThreads() {
   result_code_ = PreCreateThreadsImpl();
+  // These members must be initialized before returning from this function.
+  DCHECK(master_prefs_.get());
+  DCHECK(browser_init_.get());
   return result_code_;
 }
 
@@ -1160,6 +1163,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   local_state_ = InitializeLocalState(parsed_command_line(),
                                       is_first_run_);
 
+  // These members must be initialized before returning from this function.
+  master_prefs_.reset(new first_run::MasterPrefs);
+  browser_init_.reset(new BrowserInit);
+
   // If we're running tests (ui_task is non-null), then the ResourceBundle
   // has already been initialized.
   if (parameters().ui_task) {
@@ -1195,10 +1202,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   g_set_application_name(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str());
 #endif
 
-  // These members must be initialized before returning from this function.
-  master_prefs_.reset(new first_run::MasterPrefs);
-  browser_init_.reset(new BrowserInit);
-
   std::string try_chrome =
       parsed_command_line().GetSwitchValueASCII(switches::kTryChromeAgain);
   if (!try_chrome.empty()) {