Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4204)

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 2528013002: Initialize the message center as part of the testing browser process (Closed)
Patch Set: re-uploding due to time outs Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index c07681a7c35e2dcb7402cf75a08bebd8b1bbbb20..113dc2d52b701dc38f364378b37ffef1427cbb08 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -200,6 +200,15 @@ using content::ResourceDispatcherHost;
BrowserProcessImpl::BrowserProcessImpl(
base::SequencedTaskRunner* local_state_task_runner,
const base::CommandLine& command_line)
+ : BrowserProcessImpl::BrowserProcessImpl(
+ local_state_task_runner,
+ command_line,
+ true /* initialize_message_center */) {}
+
+BrowserProcessImpl::BrowserProcessImpl(
+ base::SequencedTaskRunner* local_state_task_runner,
+ const base::CommandLine& command_line,
+ bool initialize_message_center)
: created_watchdog_thread_(false),
created_browser_policy_connector_(false),
created_profile_manager_(false),
@@ -213,7 +222,8 @@ BrowserProcessImpl::BrowserProcessImpl(
tearing_down_(false),
download_status_updater_(new DownloadStatusUpdater),
local_state_task_runner_(local_state_task_runner),
- cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT) {
+ cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT),
+ initialize_message_center_(initialize_message_center) {
g_browser_process = this;
platform_part_.reset(new BrowserProcessPlatformPart());
@@ -251,8 +261,8 @@ BrowserProcessImpl::BrowserProcessImpl(
new extensions::ChromeExtensionsBrowserClient);
extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
#endif
-
- message_center::MessageCenter::Initialize();
+ if (initialize_message_center_)
+ message_center::MessageCenter::Initialize();
update_client::UpdateQueryParams::SetDelegate(
ChromeUpdateQueryParamsDelegate::GetInstance());
@@ -335,7 +345,8 @@ void BrowserProcessImpl::StartTearDown() {
storage_monitor::StorageMonitor::Destroy();
#endif
- message_center::MessageCenter::Shutdown();
+ if (initialize_message_center_)
+ message_center::MessageCenter::Shutdown();
// The policy providers managed by |browser_policy_connector_| need to shut
// down while the IO and FILE threads are still alive. The monitoring
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698