Upstream oodles of Chrome for Android code into Chromium.

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

-// 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.
 
 /**
  * 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;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.database.AbstractCursor;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 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";
     private static final String RESET_RESOURCE_REQUEST_COUNT = "reset_resource_request_count";
     private static final String TAG = "TestContentProvider";
     private enum ColumnIndex {
         RESOURCE_REQUEST_COUNT_COLUMN,
     }
     private final Map<String, Integer> mResourceRequestCount;
 
@@ skipping 138 matching lines @@
             return new String[] { GET_RESOURCE_REQUEST_COUNT };
         }
     }
 
     @Override
     public Cursor query(Uri uri, String[] projection, String selection,
                         String[] selectionArgs, String sortOrder) {
         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);
         }
         return null;
     }
 
     // 1x1 black dot png image.
     private static final byte[] IMAGE = {
         (byte) 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00,
@@ skipping 19 matching lines @@
             } finally {
                 if (fileOut != null) fileOut.close();
                 if (pfds != null && pfds[1] != null) pfds[1].close();
             }
         } catch (IOException e) {
             Log.e(TAG, e.getMessage(), e);
         }
         return null;
     }
 }