| Index: chrome/test/testing_browser_process.cc
|
| diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
|
| index 004ac87def5f66708b07eb864f995a173c573e74..dee2199a6e80b0489c4572fc7eeb4237f744b653 100644
|
| --- a/chrome/test/testing_browser_process.cc
|
| +++ b/chrome/test/testing_browser_process.cc
|
| @@ -23,6 +23,7 @@ TestingBrowserProcess::TestingBrowserProcess()
|
| }
|
|
|
| TestingBrowserProcess::~TestingBrowserProcess() {
|
| + pref_proxy_config_tracker_ = NULL;
|
| }
|
|
|
| void TestingBrowserProcess::EndSession() {
|
| @@ -108,6 +109,18 @@ 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();
|
| +}
|
| +
|
| +URLRequestContextGetter* TestingBrowserProcess::system_request_context() {
|
| + return NULL;
|
| +}
|
| +
|
| ui::Clipboard* TestingBrowserProcess::clipboard() {
|
| if (!clipboard_.get()) {
|
| // Note that we need a MessageLoop for the next call to work.
|
|
|