Index: chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java |
index f6e49d86921c4fcc6d34cbacb2ce496e82e50184..2c88ae22154571eead818c931e856b4315eb1f9a 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java |
@@ -28,7 +28,7 @@ import java.util.List; |
class NativeInitializationController { |
private static final String TAG = "NativeInitializationController"; |
- private final Context mContext; |
+ private final Context mAppContext; |
private final ChromeActivityNativeDelegate mActivityDelegate; |
private final Handler mHandler; |
@@ -64,7 +64,7 @@ class NativeInitializationController { |
*/ |
public NativeInitializationController(Context context, |
ChromeActivityNativeDelegate activityDelegate) { |
- mContext = context.getApplicationContext(); |
+ mAppContext = context.getApplicationContext(); |
mHandler = new Handler(Looper.getMainLooper()); |
mActivityDelegate = activityDelegate; |
} |
@@ -84,7 +84,7 @@ class NativeInitializationController { |
try { |
LibraryLoader libraryLoader = |
LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER); |
- libraryLoader.ensureInitialized(mContext.getApplicationContext()); |
+ libraryLoader.ensureInitialized(); |
// The prefetch is done after the library load for two reasons: |
// - It is easier to know the library location after it has |
// been loaded. |
@@ -101,7 +101,7 @@ class NativeInitializationController { |
mActivityDelegate.onStartupFailure(); |
return; |
} |
- if (allocateChildConnection) ChildProcessLauncher.warmUp(mContext); |
+ if (allocateChildConnection) ChildProcessLauncher.warmUp(mAppContext); |
ThreadUtils.runOnUiThread(new Runnable() { |
@Override |
public void run() { |
@@ -165,7 +165,7 @@ class NativeInitializationController { |
try { |
LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER) |
- .onNativeInitializationComplete(mContext.getApplicationContext()); |
+ .onNativeInitializationComplete(); |
} catch (ProcessInitException e) { |
Log.e(TAG, "Unable to load native library.", e); |
mActivityDelegate.onStartupFailure(); |
@@ -220,7 +220,7 @@ class NativeInitializationController { |
if (mInitializationComplete) { |
mActivityDelegate.onNewIntentWithNative(intent); |
} else { |
- if (mPendingNewIntents == null) mPendingNewIntents = new ArrayList<Intent>(1); |
+ if (mPendingNewIntents == null) mPendingNewIntents = new ArrayList<>(1); |
mPendingNewIntents.add(intent); |
} |
} |
@@ -237,7 +237,7 @@ class NativeInitializationController { |
mActivityDelegate.onActivityResultWithNative(requestCode, resultCode, data); |
} else { |
if (mPendingActivityResults == null) { |
- mPendingActivityResults = new ArrayList<ActivityResult>(1); |
+ mPendingActivityResults = new ArrayList<>(1); |
} |
mPendingActivityResults.add(new ActivityResult(requestCode, resultCode, data)); |
} |