chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java - Issue 615153002: Enable content layer to initCommandLine on Android

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/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

Issue 615153002: Enable content layer to initCommandLine on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ChromiumSyncAdapterTest#testRequestSyncWhenChromeInBackground now asserts true for CommandLine.isIn… Created 6 years, 2 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 | « base/android/java/src/org/chromium/base/CommandLine.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

index 1ba89c4fde945757ab983dec140832bd8a4f2a2d..ca96e36df9dcbef470bc6963f8e1ab0a1f2dccea 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

@@ -21,6 +21,7 @@

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;

import org.chromium.chrome.browser.profiles.Profile;

+import org.chromium.content.app.ContentApplication;

import org.chromium.content.browser.BrowserStartupController;

import java.util.concurrent.Semaphore;

@@ -53,8 +54,6 @@ public ChromiumSyncAdapter(Context context, Application application) {

protected abstract boolean useAsyncStartup();

- protected abstract void initCommandLine();

@Override

public void onPerformSync(Account account, Bundle extras, String authority,

ContentProviderClient provider, SyncResult syncResult) {

@@ -87,7 +86,7 @@ private void startBrowserProcess(

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- initCommandLine();

+ ContentApplication.initCommandLine(getContext());

if (mAsyncStartup) {

try {

BrowserStartupController.get(mApplication)