Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 1935433002: Revert of Unify application context usage. (Closed)

Created:
4 years, 7 months ago by ccameron
Modified:
4 years, 6 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, nyquist+watch-blimp_chromium.org, kmarshall+watch-blimp_chromium.org, ben+mojo_chromium.org, cbentzel+watch_chromium.org, maniscalco+watch-blimp_chromium.org, chromoting-reviews_chromium.org, jam, abarth-chromium, marcinjb+watch-blimp_chromium.org, jessicag+watch-blimp_chromium.org, darin-cc_chromium.org, jbudorick+watch_chromium.org, anandc+watch-blimp_chromium.org, sriramsr+watch-blimp_chromium.org, android-webview-reviews_chromium.org, Aaron Boodman, mikecase+watch_chromium.org, darin (slow to review), dtrainor+watch-blimp_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Unify application context usage. (patchset #2 id:20001 of https://codereview.chromium.org/1930443003/ ) Reason for revert: BUG=607811 Android android_webview_webgl_conformance_tests failing on main waterfall Original issue's description: > Reland of Unify application context usage. > > Original: https://codereview.chromium.org/1879013002/ > > Includes minor fixes: > - Add back missing native application context for unit tests. > - Add back missing native application context for loadLibrary calls. > > TBR=torne@chromium.org,davidben@chromium.org,yfriedman@chromium.org,nyquist@chromium.org,caitkp@chromium.org,sergeyu@chromium.org,amistry@chromium.org > > BUG=552419, 606824 TBR=amistry@chromium.org,caitkp@chromium.org,davidben@chromium.org,nyquist@chromium.org,sergeyu@chromium.org,torne@chromium.org,yfriedman@chromium.org,wnwen@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=552419, 606824

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+90 lines, -96 lines) Patch
M android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java View 7 chunks +19 lines, -8 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java View 4 chunks +5 lines, -9 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java View 2 chunks +2 lines, -4 lines 0 comments Download
M android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java View 2 chunks +0 lines, -2 lines 0 comments Download
M android_webview/test/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java View 2 chunks +0 lines, -2 lines 0 comments Download
M base/android/context_utils.h View 1 chunk +8 lines, -0 lines 0 comments Download
M base/android/context_utils.cc View 1 chunk +5 lines, -0 lines 0 comments Download
M base/android/java/src/org/chromium/base/ContextUtils.java View 3 chunks +18 lines, -36 lines 0 comments Download
M base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java View 4 chunks +11 lines, -8 lines 0 comments Download
M blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java View 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java View 2 chunks +0 lines, -3 lines 0 comments Download
M components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java View 2 chunks +1 line, -3 lines 0 comments Download
M components/resource_provider/android/android_hooks.cc View 1 chunk +1 line, -0 lines 0 comments Download
M components/resource_provider/android/java/org/chromium/resource_provider/Main.java View 2 chunks +0 lines, -2 lines 0 comments Download
M components/web_restrictions/browser/junit/src/org/chromium/components/webrestrictions/WebRestrictionsClientTest.java View 1 chunk +1 line, -1 line 0 comments Download
M content/public/android/java/src/org/chromium/content/app/ChildProcessService.java View 2 chunks +1 line, -2 lines 0 comments Download
M content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java View 3 chunks +4 lines, -0 lines 0 comments Download
M content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java View 1 chunk +1 line, -1 line 0 comments Download
M mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java View 2 chunks +3 lines, -4 lines 0 comments Download
M net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java View 1 chunk +1 line, -1 line 0 comments Download
M remoting/android/host/src/org/chromium/chromoting/host/jni/Host.java View 1 chunk +1 line, -2 lines 0 comments Download
M remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java View 1 chunk +2 lines, -2 lines 0 comments Download
M testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java View 3 chunks +0 lines, -3 lines 0 comments Download
M testing/android/native_test/native_test_launcher.cc View 2 chunks +4 lines, -3 lines 0 comments Download

Messages

Total messages: 6 (3 generated)
ccameron
Created Revert of Unify application context usage.
4 years, 7 months ago (2016-04-29 06:52:04 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1935433002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1935433002/1
4 years, 7 months ago (2016-04-29 06:52:47 UTC) #2
commit-bot: I haz the power
4 years, 7 months ago (2016-04-29 06:53:59 UTC) #4 
Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java:185
  Falling back to three-way merge...
  Applied patch to
'chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java'
with conflicts.
  U
chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

Patch:      
chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
Index:
chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
index
d7fda1d50b46ed159edab14250f2c2c1f2c16e6f..699105854b2fc6bd5acfc15746b0d65707cf2be4
100644
---
a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+++
b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
@@ -23,7 +23,6 @@
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContentUriUtils;
-import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ResourceExtractor;
@@ -185,8 +184,6 @@
         ThreadUtils.assertOnUiThread();
         if (mPreInflationStartupComplete) return;
 
-        ContextUtils.initApplicationContext(mApplication);
-
         // Ensure critical files are available, so they aren't blocked on the
file-system
         // behind long-running accesses in next phase.
         // Don't do any large file access here!

Powered by Google App Engine
This is Rietveld 408576698