ios/chrome/browser/favicon/favicon_service_factory.cc - Issue 1458703009: Remove ServiceIsNullForTesting override for FaviconServiceFactory

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/chrome/browser/favicon/favicon_service_factory.cc

Issue 1458703009: Remove ServiceIsNullForTesting override for FaviconServiceFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove return null for testing instead Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « ios/chrome/browser/favicon/favicon_service_factory.h ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ios/chrome/browser/favicon/favicon_service_factory.h"	5 #include "ios/chrome/browser/favicon/favicon_service_factory.h"

6	6

7 #include "base/memory/singleton.h"	7 #include "base/memory/singleton.h"

8 #include "components/favicon/core/favicon_service.h"	8 #include "components/favicon/core/favicon_service.h"

9 #include "components/keyed_service/core/service_access_type.h"	9 #include "components/keyed_service/core/service_access_type.h"

10 #include "components/keyed_service/ios/browser_state_dependency_manager.h"	10 #include "components/keyed_service/ios/browser_state_dependency_manager.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(	50 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor(

51 web::BrowserState* context) const {	51 web::BrowserState* context) const {

52 ios::ChromeBrowserState* browser_state =	52 ios::ChromeBrowserState* browser_state =

53 ios::ChromeBrowserState::FromBrowserState(context);	53 ios::ChromeBrowserState::FromBrowserState(context);

54 return make_scoped_ptr(new favicon::FaviconService(	54 return make_scoped_ptr(new favicon::FaviconService(

55 make_scoped_ptr(new FaviconClientImpl(browser_state)),	55 make_scoped_ptr(new FaviconClientImpl(browser_state)),

56 ios::HistoryServiceFactory::GetForBrowserState(	56 ios::HistoryServiceFactory::GetForBrowserState(

57 browser_state, ServiceAccessType::EXPLICIT_ACCESS)));	57 browser_state, ServiceAccessType::EXPLICIT_ACCESS)));

58 }	58 }

59	59

60 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {

61 return true;

62 }

63

64 } // namespace ios	60 } // namespace ios

OLD	NEW