Device policy infrastructure

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2011 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/browser_process_impl.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/synchronization/waitable_event.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/debugger/browser_list_tabcontents_provider.h"
 #include "chrome/browser/debugger/devtools_http_protocol_handler.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_protocol_handler.h"
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/plugin_updater.h"
-#include "chrome/browser/policy/configuration_policy_provider_keeper.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
-#include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/switch_utils.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/common/switch_utils.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "ipc/ipc_logging.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
 #endif
 
@@ skipping 21 matching lines @@
       created_io_thread_(false),
       created_file_thread_(false),
       created_db_thread_(false),
       created_process_launcher_thread_(false),
       created_cache_thread_(false),
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
       created_devtools_manager_(false),
       created_sidebar_manager_(false),
-      created_configuration_policy_provider_keeper_(false),
+      created_browser_policy_connector_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false),
       have_inspector_files_(true) {
   g_browser_process = this;
   clipboard_.reset(new ui::Clipboard);
   main_notification_service_.reset(new NotificationService);
@@ skipping 64 matching lines @@
   if (resource_dispatcher_host_.get()) {
     // Need to tell Safe Browsing Service that the IO thread is going away
     // since it cached a pointer to it.
     if (resource_dispatcher_host()->safe_browsing_service())
       resource_dispatcher_host()->safe_browsing_service()->ShutDown();
 
     // Cancel pending requests and prevent new requests.
     resource_dispatcher_host()->Shutdown();
   }
 
-  // The policy providers managed by |configuration_policy_provider_keeper_|
-  // need to shut down while the file thread is still alive.
-  configuration_policy_provider_keeper_.reset();
+  // The policy providers managed by |browser_policy_connector_| need to shut
+  // down while the IO and FILE threads are still alive.
+  browser_policy_connector_.reset();
 
 #if defined(USE_X11)
   // The IO thread must outlive the BACKGROUND_X11 thread.
   background_x11_thread_.reset();
 #endif
 
   // Wait for removing plugin data to finish before shutting down the IO thread.
   WaitForPluginDataRemoverToFinish();
 
   // Need to stop io_thread_ before resource_dispatcher_host_, since
@@ skipping 220 matching lines @@
   return clipboard_.get();
 }
 
 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_notification_ui_manager_)
     CreateNotificationUIManager();
   return notification_ui_manager_.get();
 }
 
-policy::ConfigurationPolicyProviderKeeper*
-    BrowserProcessImpl::configuration_policy_provider_keeper() {
+policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
   DCHECK(CalledOnValidThread());
-  if (!created_configuration_policy_provider_keeper_) {
-    DCHECK(configuration_policy_provider_keeper_.get() == NULL);
-    created_configuration_policy_provider_keeper_ = true;
-    configuration_policy_provider_keeper_.reset(
-        new policy::ConfigurationPolicyProviderKeeper());
+  if (!created_browser_policy_connector_) {
+    DCHECK(browser_policy_connector_.get() == NULL);
+    created_browser_policy_connector_ = true;
+    browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
   }
-  return configuration_policy_provider_keeper_.get();
+  return browser_policy_connector_.get();
 }
 
 IconManager* BrowserProcessImpl::icon_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_icon_manager_)
     CreateIconManager();
   return icon_manager_.get();
 }
 
 ThumbnailGenerator* BrowserProcessImpl::GetThumbnailGenerator() {
@@ skipping 490 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)