Move InstantApps stuff into a separate package.

This is in preparation for adding UI. Will keep the future code grouped
together.

BUG=609556

Review-Url: https://codereview.chromium.org/2258573002
Cr-Commit-Position: refs/heads/master@{#412699}

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

@@ -55,6 +55,7 @@ import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.browser.init.InvalidStartupDialog;
+import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.metrics.VariationsSession;

chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java

@@ -28,7 +28,6 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.InstantAppsHandler;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
 import org.chromium.chrome.browser.IntentHandler.TabOpenType;
@@ -42,6 +41,7 @@ import org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity;
 import org.chromium.chrome.browser.firstrun.FirstRunActivity;
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity;
+import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.metrics.MediaNotificationUma;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;

chrome/android/java/src/org/chromium/chrome/browser/InstantAppsHandler.java → chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.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.chrome.browser;
+package org.chromium.chrome.browser.instantapps;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,6 +13,9 @@ import android.provider.Browser;
 import org.chromium.base.CommandLine;
 import org.chromium.base.FieldTrialList;
 import org.chromium.base.Log;
+import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.metrics.LaunchMetrics.TimesHistogramSample;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -25,7 +25,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.InstantAppsHandler;
+import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
 import org.chromium.chrome.browser.webapps.ChromeWebApkHost;

chrome/android/java_sources.gni

@@ -34,7 +34,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/FileProviderHelper.java",
   "java/src/org/chromium/chrome/browser/FrozenNativePage.java",
   "java/src/org/chromium/chrome/browser/InsetObserverView.java",
-  "java/src/org/chromium/chrome/browser/InstantAppsHandler.java",
   "java/src/org/chromium/chrome/browser/IntentHandler.java",
   "java/src/org/chromium/chrome/browser/IntentHelper.java",
   "java/src/org/chromium/chrome/browser/ItemChooserDialog.java",
@@ -427,6 +426,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/init/EmptyBrowserParts.java",
   "java/src/org/chromium/chrome/browser/init/InvalidStartupDialog.java",
   "java/src/org/chromium/chrome/browser/init/NativeInitializationController.java",
+  "java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java",
   "java/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapter.java",
   "java/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterService.java",
   "java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java",
@@ -1070,7 +1070,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/FocusedEditableTextFieldZoomTest.java",
   "javatests/src/org/chromium/chrome/browser/GeolocationTest.java",
   "javatests/src/org/chromium/chrome/browser/HistoryUITest.java",
-  "javatests/src/org/chromium/chrome/browser/InstantAppsHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java",
   "javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java",
@@ -1179,6 +1178,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java",
   "javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java",
+  "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java",
   "javatests/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java",

chrome/android/javatests/src/org/chromium/chrome/browser/InstantAppsHandlerTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.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.chrome.browser;
+package org.chromium.chrome.browser.instantapps;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,6 +13,7 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.IntentHandler;
 
 /**
  * Unit tests for {@link InstantAppsHandler}.