Fix broken tests on M.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index b71187b9429cd1f0505f6389027c6be09fa0b1d1..e765c50f8f71825c613dd506ea222df5cdf8dae0 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
@@ -35,6 +35,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
+import org.chromium.base.PathUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.test.util.CommandLineFlags;
@@ -71,6 +72,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * Instrumentation tests for app menu, context menu, and toolbar of a {@link CustomTabActivity}.
  */
 public class CustomTabActivityTest extends CustomTabActivityTestBase {

[Yaron, 2016/02/08 21:51:41]

I think the CustomTabs ones may be indicative of a real bug.

Note CustomTabsConnection.initializeBrowser. It has a separate call out to
LibraryLoader and uses a slightly different flow through CBI
(ChromeBrowserInitializer.handleSynchronousStartup) which in turn calls
PathUtils but we've already invoked LibraryLoader.

+    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chrome";
 
     /**
      * An empty {@link BroadcastReceiver} that exists only to make the PendingIntent to carry an
@@ -774,6 +776,10 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
 
     private void mayLaunchUrlWithoutWarmup(boolean noPrerendering) {
         Context context = getInstrumentation().getTargetContext().getApplicationContext();
+
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,
+                context);
+
         CustomTabsConnection connection =
                 CustomTabsTestUtils.setUpConnection((Application) context);
         ICustomTabsCallback cb = new CustomTabsTestUtils.DummyCallback();
@@ -796,6 +802,10 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
 
     private CustomTabsConnection warmUpAndWait() {
         final Context context = getInstrumentation().getTargetContext().getApplicationContext();
+
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,
+                context);
+
         CustomTabsConnection connection =
                 CustomTabsTestUtils.setUpConnection((Application) context);
         final CallbackHelper startupCallbackHelper = new CallbackHelper();