| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 5d9bd8a748a41176273dafb16a9e0dea4476b96a..fcb80e07b32453626ef6cdbb88dea69a110db3f8 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -26,7 +26,9 @@ class HostContentSettingsMap;
|
| namespace content {
|
| class MockResourceContext;
|
| class SSLHostStateDelegate;
|
| +#if !defined(OS_ANDROID)
|
| class ZoomLevelDelegate;
|
| +#endif // !defined(OS_ANDROID)
|
| }
|
|
|
| namespace net {
|
| @@ -233,8 +235,10 @@ class TestingProfile : public Profile {
|
|
|
| // content::BrowserContext
|
| base::FilePath GetPath() const override;
|
| +#if !defined(OS_ANDROID)
|
| std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
|
| const base::FilePath& partition_path) override;
|
| +#endif // !defined(OS_ANDROID)
|
| scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
|
| bool IsOffTheRecord() const override;
|
| content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
|
| @@ -300,7 +304,9 @@ class TestingProfile : public Profile {
|
|
|
| PrefService* GetPrefs() override;
|
| const PrefService* GetPrefs() const override;
|
| +#if !defined(OS_ANDROID)
|
| ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
|
| +#endif // !defined(OS_ANDROID)
|
| net::URLRequestContextGetter* GetRequestContext() override;
|
| net::URLRequestContextGetter* GetRequestContextForExtensions() override;
|
| net::SSLConfigService* GetSSLConfigService() override;
|
|
|