Android: Move cipher lib to Chrome

ByteArrayGenerator, CipherFactory are used by Chrome only, and
don't have to be in content layer. This CL moves it to chrome
directory, and deletes the corresponding DEPS exception rules.

Bug: 617324
Change-Id: Iee5d8effe2148ef3e50375e8848048a58a0cc046
Reviewed-on: https://chromium-review.googlesource.com/1049769
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Chris Palmer <palmer@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558149}

chrome/android/java/DEPS

@@ -23,8 +23,6 @@ include_rules = [
   "!content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java",
-  "!content/public/android/java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java",
-  "!content/public/android/java/src/org/chromium/content/browser/crypto/CipherFactory.java",
   "!content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java",
   "!content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java",
   "!content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java",

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -66,6 +66,7 @@ import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromeTablet;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver;
 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
 import org.chromium.chrome.browser.cookies.CookiesFetcher;
+import org.chromium.chrome.browser.crypto.CipherFactory;
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.document.DocumentUtils;
 import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
@@ -134,7 +135,6 @@ import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
-import org.chromium.content.browser.crypto.CipherFactory;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.content_public.browser.ContentVideoView;
 import org.chromium.content_public.browser.LoadUrlParams;

chrome/android/java/src/org/chromium/chrome/browser/TabState.java

@@ -13,10 +13,10 @@ import android.util.Pair;
 
 import org.chromium.base.StreamUtil;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.crypto.CipherFactory;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.components.sync.SyncConstants;
-import org.chromium.content.browser.crypto.CipherFactory;
 import org.chromium.content_public.browser.WebContents;
 
 import java.io.BufferedOutputStream;

chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java

@@ -11,8 +11,8 @@ import org.chromium.base.ImportantFileWriterAndroid;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.crypto.CipherFactory;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.content.browser.crypto.CipherFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;

content/public/android/java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java → chrome/android/java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java

@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser.crypto;
+package org.chromium.chrome.browser.crypto;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 /**
- * Generates byte arrays for use in crypto algorithms. Defaults to pulling random data
- * from /dev/urandom, but can be overwritten for other generation methods.
+ * Reads /dev/urandom to generate byte arrays for used in cryptographic functions.
  */
 public class ByteArrayGenerator {
     /**

content/public/android/java/src/org/chromium/content/browser/crypto/CipherFactory.java → chrome/android/java/src/org/chromium/chrome/browser/crypto/CipherFactory.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser.crypto;
+package org.chromium.chrome.browser.crypto;
 
 import android.annotation.SuppressLint;
 import android.os.AsyncTask;

chrome/android/java/src/org/chromium/chrome/browser/installedapp/PackageHash.java

@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.installedapp;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
-import org.chromium.content.browser.crypto.ByteArrayGenerator;
+import org.chromium.chrome.browser.crypto.ByteArrayGenerator;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -60,6 +60,7 @@ import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper;
+import org.chromium.chrome.browser.crypto.CipherFactory;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.download.ChromeDownloadDelegate;
@@ -103,7 +104,6 @@ import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.components.sync.SyncConstants;
-import org.chromium.content.browser.crypto.CipherFactory;
 import org.chromium.content_public.browser.ChildProcessImportance;
 import org.chromium.content_public.browser.ContentViewCore;
 import org.chromium.content_public.browser.GestureListenerManager;

chrome/android/java_sources.gni

@@ -336,6 +336,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java",
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionHandler.java",
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java",
+  "java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java",
+  "java/src/org/chromium/chrome/browser/crypto/CipherFactory.java",
   "java/src/org/chromium/chrome/browser/customtabs/ClientManager.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java",
@@ -1599,6 +1601,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporterTest.java",
+  "javatests/src/org/chromium/chrome/browser/crypto/CipherFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestRule.java",

content/public/android/javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/crypto/CipherFactoryTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser.crypto;
+package org.chromium.chrome.browser.crypto;
 
 import android.os.Bundle;
 import android.support.test.filters.MediumTest;
@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.content.browser.crypto.CipherFactory.CipherDataObserver;
+import org.chromium.chrome.browser.crypto.CipherFactory.CipherDataObserver;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

content/public/android/BUILD.gn

@@ -164,8 +164,6 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayCore.java",
     "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayImpl.java",
     "java/src/org/chromium/content/browser/androidoverlay/ThreadHoppingHost.java",
-    "java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java",
-    "java/src/org/chromium/content/browser/crypto/CipherFactory.java",
     "java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
     "java/src/org/chromium/content/browser/framehost/RenderFrameHostDelegate.java",
     "java/src/org/chromium/content/browser/framehost/RenderFrameHostImpl.java",
@@ -487,7 +485,6 @@ android_library("content_javatests") {
     "javatests/src/org/chromium/content/browser/androidoverlay/DialogOverlayImplPixelTest.java",
     "javatests/src/org/chromium/content/browser/androidoverlay/DialogOverlayImplTest.java",
     "javatests/src/org/chromium/content/browser/androidoverlay/DialogOverlayImplTestRule.java",
-    "javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java",
     "javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java",
     "javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java",
     "javatests/src/org/chromium/content/browser/input/ImeAutocapitalizeTest.java",