Upstream oodles of Chrome for Android code into Chromium.

chrome/test/android/javatests_staging/src/org/chromium/chrome/test/TestContentProvider.java

Index: chrome/test/android/javatests_staging/src/org/chromium/chrome/test/TestContentProvider.java
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java b/chrome/test/android/javatests_staging/src/org/chromium/chrome/test/TestContentProvider.java
similarity index 95%
copy from android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
copy to chrome/test/android/javatests_staging/src/org/chromium/chrome/test/TestContentProvider.java
index a5217922147222298e3967df31835bc5dab6fbe6..f13980e883dbe720d89b6f3cddb1d141ce488e50 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
+++ b/chrome/test/android/javatests_staging/src/org/chromium/chrome/test/TestContentProvider.java
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
 
@@ -6,7 +6,7 @@
  * Content provider for testing content URLs.
  */
 
-package org.chromium.android_webview.test;
+package org.chromium.chrome.test;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -25,8 +25,7 @@ import java.util.Map;
 
 // Note: if you move this class, make sure you have also updated AndroidManifest.xml
 public class TestContentProvider extends ContentProvider {
-    private static final String AUTHORITY =
-            "org.chromium.android_webview.test.TestContentProvider";
+    private static final String AUTHORITY = "org.chromium.chrome.test.TestContentProvider";
     private static final String CONTENT_SCHEME = "content://";
     private static final String CONTENT_TYPE = "image/png";
     private static final String GET_RESOURCE_REQUEST_COUNT = "get_resource_request_count";
@@ -185,8 +184,7 @@ public class TestContentProvider extends ContentProvider {
         String action = uri.getLastPathSegment();
         String resource = uri.getQuery();
         if (GET_RESOURCE_REQUEST_COUNT.equals(action)) {
-            return new ProviderStateCursor(
-                mResourceRequestCount.containsKey(resource)
+            return new ProviderStateCursor(mResourceRequestCount.containsKey(resource)
                     ? mResourceRequestCount.get(resource) : 0);
         } else if (RESET_RESOURCE_REQUEST_COUNT.equals(action)) {
             mResourceRequestCount.put(resource, 0);