| Index: chrome/browser/prefs/pref_service_mock_builder.cc
|
| diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
|
| index ce7f4477aeb4d536e2b78db5b49d22ca113b3681..2209c96c66b265cef75ecffdb143d2d666c2dcd3 100644
|
| --- a/chrome/browser/prefs/pref_service_mock_builder.cc
|
| +++ b/chrome/browser/prefs/pref_service_mock_builder.cc
|
| @@ -15,7 +15,6 @@
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/pref_value_store.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "ui/base/l10n/l10n_util.h"
|
|
|
| using content::BrowserThread;
|
|
|
| @@ -47,10 +46,18 @@ PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
|
| return *this;
|
| }
|
|
|
| -PrefService* PrefServiceMockBuilder::Create() {
|
| - PrefService* pref_service = PrefServiceBuilder::Create();
|
| +PrefServiceSimple* PrefServiceMockBuilder::CreateSimple() {
|
| + PrefServiceSimple* service = new PrefServiceSimple;
|
| + PrefServiceBuilder::Build(service);
|
| ResetTestingState();
|
| - return pref_service;
|
| + return service;
|
| +}
|
| +
|
| +PrefServiceSyncable* PrefServiceMockBuilder::CreateSyncable() {
|
| + PrefServiceSyncable* service = new PrefServiceSyncable;
|
| + PrefServiceBuilder::Build(service);
|
| + ResetTestingState();
|
| + return service;
|
| }
|
|
|
| void PrefServiceMockBuilder::ResetTestingState() {
|
|
|