Reland #2 of Fix monochrome not booting issue

chrome/browser/chrome_browser_main_android.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_android.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
 #include "chrome/browser/android/seccomp_support_detector.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/main_function_params.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
-#include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace {
 
 void DeleteFileTask(
     const base::FilePath& file_path) {
   if (base::PathExists(file_path))
     base::DeleteFile(file_path, false);
 }
 
@@ skipping 27 matching lines @@
   if (!breakpad_enabled)
     breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableCrashReporterForTesting);
 
   if (breakpad_enabled) {
     base::FilePath crash_dump_dir;
     PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
     crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir));
   }
 
-  ui::SetLocalePaksStoredInApk(false);
-
   return ChromeBrowserMainParts::PreCreateThreads();
 }
 
 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
   ChromeBrowserMainParts::PostProfileInit();
 
   // Previously we stored information related to salient images for bookmarks
   // in a local file. We replaced the salient images with favicons. As part
   // of the clean up, the local file needs to be deleted. See crbug.com/499415.
   base::FilePath bookmark_image_file_path =
@@ skipping 39 matching lines @@
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
       base::Bind(&SeccompSupportDetector::StartDetection),
       base::TimeDelta::FromMinutes(1));
 
   RegisterChromeJavaMojoInterfaces();
 }
 
 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
   NOTREACHED();
 }