| Index: chrome/test/testing_profile.h
|
| diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
|
| index ec2f82a2ed42f4e87fea3f455132e05d3c25f120..49e625df53252c56f9e91a38cb234f1f0bdbb7f5 100644
|
| --- a/chrome/test/testing_profile.h
|
| +++ b/chrome/test/testing_profile.h
|
| @@ -169,6 +169,8 @@ class TestingProfile : public Profile {
|
| // TestingPrefService takes ownership of |prefs|.
|
| void SetPrefService(PrefService* prefs);
|
| virtual PrefService* GetPrefs();
|
| + void SetLocalState(PrefService* local_state);
|
| + virtual PrefService* GetLocalState();
|
| virtual TemplateURLModel* GetTemplateURLModel();
|
| virtual TemplateURLFetcher* GetTemplateURLFetcher();
|
| virtual history::TopSites* GetTopSites();
|
| @@ -246,10 +248,6 @@ class TestingProfile : public Profile {
|
| virtual FilePath last_selected_directory();
|
| virtual void set_last_selected_directory(const FilePath& path);
|
| #if defined(OS_CHROMEOS)
|
| - virtual chromeos::ProxyConfigServiceImpl*
|
| - GetChromeOSProxyConfigServiceImpl() {
|
| - return NULL;
|
| - }
|
| virtual void SetupChromeOSEnterpriseExtensionObserver() {
|
| }
|
| virtual void InitChromeOSPreferences() {
|
| @@ -282,6 +280,7 @@ class TestingProfile : public Profile {
|
| protected:
|
| base::Time start_time_;
|
| scoped_ptr<PrefService> prefs_;
|
| + scoped_ptr<PrefService> local_state_;
|
| // ref only for right type, lifecycle is managed by prefs_
|
| TestingPrefService* testing_prefs_;
|
|
|
|
|