diff options
| author | jwd@chromium.org <jwd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 15:36:21 +0000 |
|---|---|---|
| committer | jwd@chromium.org <jwd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 15:36:21 +0000 |
| commit | 54e26c1249af1c3165587938d9edb0daf4ce4c21 (patch) | |
| tree | 375d6077421f84755f4f7cd2dad2993daf110dae /chrome/test/base/testing_browser_process.cc | |
| parent | 2e2216e43424120be34fe6cab1136eddecbeb4a0 (diff) | |
| download | chromium_src-54e26c1249af1c3165587938d9edb0daf4ce4c21.zip chromium_src-54e26c1249af1c3165587938d9edb0daf4ce4c21.tar.gz chromium_src-54e26c1249af1c3165587938d9edb0daf4ce4c21.tar.bz2 | |
Restoring the chrome variatioons client, with a fix for browser_test failures caused by it.
The CLs that this is restoring are http://codereview.chromium.org/10343007 and http://codereview.chromium.org/10381021.
BUG=121695
TEST=
Review URL: https://chromiumcodereview.appspot.com/10392007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/testing_browser_process.cc')
| -rw-r--r-- | chrome/test/base/testing_browser_process.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc index 37cbc48..8cb8a78 100644 --- a/chrome/test/base/testing_browser_process.cc +++ b/chrome/test/base/testing_browser_process.cc @@ -62,6 +62,10 @@ PrefService* TestingBrowserProcess::local_state() { return local_state_; } +VariationsService* TestingBrowserProcess::variations_service() { + return NULL; +} + policy::BrowserPolicyConnector* TestingBrowserProcess::browser_policy_connector() { #if defined(ENABLE_CONFIGURATION_POLICY) |