diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/testing_browser_process.cc | 12 | ||||
-rw-r--r-- | chrome/test/testing_browser_process.h | 7 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc index 9a4e72f..b8a030a 100644 --- a/chrome/test/testing_browser_process.cc +++ b/chrome/test/testing_browser_process.cc @@ -13,6 +13,7 @@ #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() @@ -113,6 +114,17 @@ 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 95895d7..05d37a6 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -80,6 +80,13 @@ 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 3ae70ba..7c3ae2bb 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -259,10 +259,6 @@ 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() { |