Extended: Add "system" URLRequestContext

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"
@@ skipping 36 matching lines @@
 #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/json_pref_store.h"
+#include "chrome/common/net/url_request_context_getter.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/installer/util/google_update_constants.h"
 #include "content/browser/browser_child_process_host.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/common/notification_service.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
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "content/common/child_process_messages.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#endif  // defined(OS_CHROMEOS)
+
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 // How often to check if the persistent instance of Chrome needs to restart
 // to install an update.
 static const int kUpdateCheckIntervalHours = 6;
 #endif
 
 #if defined(USE_X11)
 // How long to wait for the File thread to complete during EndSession, on
 // Linux. We have a timeout here because we're unable to run the UI messageloop
 // and there's some deadlock risk. Our only option is to exit anyway.
@@ skipping 341 matching lines @@
   if (!created_sidebar_manager_)
     CreateSidebarManager();
   return sidebar_manager_.get();
 }
 
 ui::Clipboard* BrowserProcessImpl::clipboard() {
   DCHECK(CalledOnValidThread());
   return clipboard_.get();
 }
 
+URLRequestContextGetter* BrowserProcessImpl::system_request_context() {
+  DCHECK(CalledOnValidThread());
+  return io_thread()->system_url_request_context_getter();
+}
+
+#if defined(OS_CHROMEOS)
+chromeos::ProxyConfigServiceImpl*
+BrowserProcessImpl::chromeos_proxy_config_service_impl() {

[willchan no longer on Chromium, 2011/03/10 00:40:02]

DCHECK(CalledOnValidThread())

Perhaps you should have a created_foo_ bool like the others to make sure this
isn't double initialized?

[battre, 2011/03/10 16:11:57]

I have added the DCHECK. I think there is no need for a created_foo_ bool:
The chromeos_proxy_config_service_impl_ variable is initialized only once and !=
NULL afterwards. We need the created_foo_ booleans only for variables that are
manually reset in the destructor at times when consumers of BrowserProcessImpl
could still try to access them. In this case the following sequence would be
possible and justifies the created_foo_ booleans:
- destructor is called
  - variable foo_ is reset to zero
- consumer of BrowserProcessImpl calls BrowserBrocessImpl::foo()
--> foo_ is initialized a second time

This cannot happen for BrowserProcessImpl.

I can add the created_foo_ variable but I think there is no benefit.

+  if (!chromeos_proxy_config_service_impl_) {
+    chromeos_proxy_config_service_impl_ =
+        new chromeos::ProxyConfigServiceImpl();
+  }
+  return chromeos_proxy_config_service_impl_;
+}
+#endif  // defined(OS_CHROMEOS)
+
 ExtensionEventRouterForwarder*
 BrowserProcessImpl::extension_event_router_forwarder() {
   return extension_event_router_forwarder_.get();
 }
 
 NotificationUIManager* BrowserProcessImpl::notification_ui_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_notification_ui_manager_)
     CreateNotificationUIManager();
   return notification_ui_manager_.get();
@@ skipping 542 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)