Revert 78228 - Extended: Add "system" URLRequestContext (not ready for use!)

This is an extension of http://codereview.chromium.org/6280018 that provides a proxy configuration which respects command line parameters and policies

BUG=67232,70732
TEST=Start chrome, observe two PROXY_CONFIG_CHANGED events in about:net-internals (if you are on a corporate network  with PAC configurations), observe that everything behaves as usual. In particular the https://www.google.com/searchdomaincheck?format=domain&type=chrome request should not fail as it uses the new system URLRequestContext.

Review URL: http://codereview.chromium.org/6292017

TBR=battre@chromium.org
Review URL: http://codereview.chromium.org/6693023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78240 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 19 deletions

diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
index b8a030a..9a4e72f 100644
--- a/chrome/test/testing_browser_process.cc
+++ b/chrome/test/testing_browser_process.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/policy/dummy_configuration_policy_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/net/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 
 TestingBrowserProcess::TestingBrowserProcess()
@@ -114,17 +113,6 @@ TestingBrowserProcess::safe_browsing_detection_service() {
   return NULL;
 }
 
-URLRequestContextGetter* TestingBrowserProcess::system_request_context() {
-  return NULL;
-}
-
-#if defined(OS_CHROMEOS)
-chromeos::ProxyConfigServiceImpl*
-TestingBrowserProcess::chromeos_proxy_config_service_impl() {
-  return NULL;
-}
-#endif  // defined(OS_CHROMEOS)
-
 ui::Clipboard* TestingBrowserProcess::clipboard() {
   if (!clipboard_.get()) {
     // Note that we need a MessageLoop for the next call to work.
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 05d37a6..95895d7 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -80,13 +80,6 @@ class TestingBrowserProcess : public BrowserProcess {
   virtual safe_browsing::ClientSideDetectionService*
       safe_browsing_detection_service();
 
-  virtual URLRequestContextGetter* system_request_context();
-
-#if defined(OS_CHROMEOS)
-  virtual chromeos::ProxyConfigServiceImpl*
-      chromeos_proxy_config_service_impl();
-#endif  // defined(OS_CHROMEOS)
-
   virtual ui::Clipboard* clipboard();
 
   virtual ExtensionEventRouterForwarder* extension_event_router_forwarder();
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index acea619..49063b5 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -255,6 +255,10 @@ class TestingProfile : public Profile {
   virtual FilePath last_selected_directory();
   virtual void set_last_selected_directory(const FilePath& path);
 #if defined(OS_CHROMEOS)
+  virtual chromeos::ProxyConfigServiceImpl*
+      GetChromeOSProxyConfigServiceImpl() {
+    return NULL;
+  }
   virtual void SetupChromeOSEnterpriseExtensionObserver() {
   }
   virtual void InitChromeOSPreferences() {