| Index: chrome/test/testing_browser_process.cc
|
| diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
|
| index 30e8064ffe4f71cb96ec0a4c4e35d02f897780b4..a00d7ce1cd25c84ea0620e26637babb8356309cb 100644
|
| --- a/chrome/test/testing_browser_process.cc
|
| +++ b/chrome/test/testing_browser_process.cc
|
| @@ -7,11 +7,13 @@
|
| #include "base/string_util.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "chrome/browser/google/google_url_tracker.h"
|
| +#include "chrome/browser/net/pref_proxy_config_service.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/policy/configuration_policy_pref_store.h"
|
| #include "chrome/browser/policy/configuration_policy_provider.h"
|
| #include "chrome/browser/policy/configuration_policy_provider_keeper.h"
|
| #include "chrome/browser/policy/dummy_configuration_policy_provider.h"
|
| +#include "chrome/common/net/url_request_context_getter.h"
|
| #include "ui/base/clipboard/clipboard.h"
|
|
|
| TestingBrowserProcess::TestingBrowserProcess()
|
| @@ -23,6 +25,7 @@ TestingBrowserProcess::TestingBrowserProcess()
|
| }
|
|
|
| TestingBrowserProcess::~TestingBrowserProcess() {
|
| + pref_proxy_config_tracker_ = NULL;
|
| }
|
|
|
| void TestingBrowserProcess::EndSession() {
|
| @@ -108,6 +111,26 @@ TestingBrowserProcess::safe_browsing_detection_service() {
|
| return NULL;
|
| }
|
|
|
| +PrefProxyConfigTracker* TestingBrowserProcess::pref_proxy_config_tracker() {
|
| + if (!pref_proxy_config_tracker_.get()) {
|
| + pref_proxy_config_tracker_ =
|
| + new PrefProxyConfigTracker(local_state());
|
| + }
|
| + return pref_proxy_config_tracker_.get();
|
| +}
|
| +
|
| +scoped_refptr<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.
|
|
|