| Index: chrome/test/base/testing_profile.cc
|
| ===================================================================
|
| --- chrome/test/base/testing_profile.cc (revision 145147)
|
| +++ chrome/test/base/testing_profile.cc (working copy)
|
| @@ -26,6 +26,8 @@
|
| #include "chrome/browser/extensions/test_extension_system.h"
|
| #include "chrome/browser/favicon/favicon_service.h"
|
| #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
|
| +#include "chrome/browser/history/shortcuts_backend.h"
|
| +#include "chrome/browser/history/shortcuts_backend_factory.h"
|
| #include "chrome/browser/history/history.h"
|
| #include "chrome/browser/history/history_backend.h"
|
| #include "chrome/browser/history/history_service_factory.h"
|
| @@ -504,10 +506,6 @@
|
| return policy_service_.get();
|
| }
|
|
|
| -history::ShortcutsBackend* TestingProfile::GetShortcutsBackend() {
|
| - return NULL;
|
| -}
|
| -
|
| void TestingProfile::SetPrefService(PrefService* prefs) {
|
| #if defined(ENABLE_PROTECTOR_SERVICE)
|
| // ProtectorService binds itself very closely to the PrefService at the moment
|
|
|