Changes BrowserProcess::browser_policy_connector() return type
To Chrome specific type. This is a precursor to adding calls to a
ChromeBrowserPolicyConnector.
BUG=800357
TEST=none
Change-Id: If6d82958e598436155e2d36f1a46108264031a57
Reviewed-on: https://chromium-review.googlesource.com/864627
Reviewed-by: Elliot Glaysher <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529013}diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 562fe79..bd7d6a8 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -63,6 +63,7 @@
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
#include "chrome/browser/plugins/plugin_finder.h"
+#include "chrome/browser/policy/chrome_browser_policy_connector.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/chrome_pref_service_factory.h"
#include "chrome/browser/printing/background_printing_manager.h"
@@ -95,7 +96,6 @@
#include "components/network_time/network_time_tracker.h"
#include "components/optimization_guide/optimization_guide_service.h"
#include "components/physical_web/data_source/physical_web_data_source.h"
-#include "components/policy/core/browser/browser_policy_connector.h"
#include "components/policy/core/common/policy_service.h"
#include "components/prefs/json_pref_store.h"
#include "components/prefs/pref_registry_simple.h"
@@ -212,20 +212,8 @@
BrowserProcessImpl::BrowserProcessImpl(
base::SequencedTaskRunner* local_state_task_runner)
- : created_watchdog_thread_(false),
- created_browser_policy_connector_(false),
- created_profile_manager_(false),
- created_icon_manager_(false),
- created_notification_ui_manager_(false),
- created_notification_bridge_(false),
- created_safe_browsing_service_(false),
- created_subresource_filter_ruleset_service_(false),
- created_optimization_guide_service_(false),
- shutting_down_(false),
- tearing_down_(false),
- download_status_updater_(base::MakeUnique<DownloadStatusUpdater>()),
+ : download_status_updater_(std::make_unique<DownloadStatusUpdater>()),
local_state_task_runner_(local_state_task_runner),
- cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT),
pref_service_factory_(
base::MakeUnique<prefs::InProcessPrefServiceFactory>()) {
g_browser_process = this;
@@ -655,7 +643,8 @@
return message_center::MessageCenter::Get();
}
-policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
+policy::ChromeBrowserPolicyConnector*
+BrowserProcessImpl::browser_policy_connector() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (!created_browser_policy_connector_) {
DCHECK(!browser_policy_connector_);
