Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.mojo;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 
 import org.chromium.base.JNINamespace;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 
 /**
  * Base class to test mojo. Setup the environment.
  */
 @JNINamespace("mojo::android")
 public class MojoTestCase extends InstrumentationTestCase {
 
     private long mTestEnvironmentPointer;
 
     /**
      * @see junit.framework.TestCase#setUp()
      */
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
-        nativeInitApplicationContext(getInstrumentation().getTargetContext());
+        Context context = getInstrumentation().getTargetContext();
+        LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized(context);
+        nativeInitApplicationContext(context);
         mTestEnvironmentPointer = nativeSetupTestEnvironment();
     }
 
     /**
      * @see android.test.InstrumentationTestCase#tearDown()
      */
     @Override
     protected void tearDown() throws Exception {
         nativeTearDownTestEnvironment(mTestEnvironmentPointer);
         super.tearDown();
@@ skipping 15 matching lines @@
 
     private native void nativeInitApplicationContext(Context context);
 
     private native long nativeSetupTestEnvironment();
 
     private native void nativeTearDownTestEnvironment(long testEnvironment);
 
     private native void nativeRunLoop(long timeoutMS);
 
 }