chrome/browser/invalidation/profile_invalidation_provider_factory.cc - Issue 2801033002: Revert of Android: Remove GetApplicationContext part 2

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

Unified Diff: chrome/browser/invalidation/profile_invalidation_provider_factory.cc

Issue 2801033002: Revert of Android: Remove GetApplicationContext part 2 (Closed)

Patch Set: Created 3 years, 8 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/invalidation/invalidation_service_factory_android.cc ('k') | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc

diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

index 9b42e17e1c114c727f5a1d87e74ed4680230095d..fb319800acc839e97e867e9035a148d6fe9c72e7 100644

--- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc

@@ -33,6 +33,7 @@

#include "net/url_request/url_request_context_getter.h"

#if defined(OS_ANDROID)

+#include "base/android/context_utils.h"

#include "components/invalidation/impl/invalidation_service_android.h"

#endif // defined(OS_ANDROID)

@@ -100,8 +101,8 @@

return testing_factory_(context).release();

#if defined(OS_ANDROID)

- return new ProfileInvalidationProvider(

- std::unique_ptr<InvalidationService>(new InvalidationServiceAndroid()));

+ return new ProfileInvalidationProvider(std::unique_ptr<InvalidationService>(

+ new InvalidationServiceAndroid(base::android::GetApplicationContext())));

#else

std::unique_ptr<IdentityProvider> identity_provider;