diff options
| author | jyquinn <jyquinn@chromium.org> | 2015-11-23 07:42:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-23 15:43:10 +0000 |
| commit | 19acda1ba5c116bbc4cea6c9163d10c65a9ba1c8 (patch) | |
| tree | 8115e494eb177ab19aa529e88df4146cfad7b8e0 | |
| parent | c2da6320db663fe44cba68cd8460bdd13ef1824e (diff) | |
| download | chromium_src-19acda1ba5c116bbc4cea6c9163d10c65a9ba1c8.zip chromium_src-19acda1ba5c116bbc4cea6c9163d10c65a9ba1c8.tar.gz chromium_src-19acda1ba5c116bbc4cea6c9163d10c65a9ba1c8.tar.bz2 | |
Remove ServiceIsNullForTesting override for FaviconServiceFactory
Removes ServiceIsNullForTesting override in FaviconServiceFactory
to enable use of FaviconServiceFactory in tests.
BUG=557415
Review URL: https://codereview.chromium.org/1458703009
Cr-Commit-Position: refs/heads/master@{#361108}
| -rw-r--r-- | ios/chrome/browser/favicon/favicon_service_factory.cc | 4 | ||||
| -rw-r--r-- | ios/chrome/browser/favicon/favicon_service_factory.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ios/chrome/browser/favicon/favicon_service_factory.cc b/ios/chrome/browser/favicon/favicon_service_factory.cc index 1edd164..886309f 100644 --- a/ios/chrome/browser/favicon/favicon_service_factory.cc +++ b/ios/chrome/browser/favicon/favicon_service_factory.cc @@ -57,8 +57,4 @@ scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor( browser_state, ServiceAccessType::EXPLICIT_ACCESS))); } -bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { - return true; -} - } // namespace ios diff --git a/ios/chrome/browser/favicon/favicon_service_factory.h b/ios/chrome/browser/favicon/favicon_service_factory.h index 53c339e..3e40d91 100644 --- a/ios/chrome/browser/favicon/favicon_service_factory.h +++ b/ios/chrome/browser/favicon/favicon_service_factory.h @@ -42,7 +42,6 @@ class FaviconServiceFactory : public BrowserStateKeyedServiceFactory { // BrowserStateKeyedServiceFactory implementation. scoped_ptr<KeyedService> BuildServiceInstanceFor( web::BrowserState* context) const override; - bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(FaviconServiceFactory); }; |