Revert 254929 "Add UI hook for distilling web pages for test shell."

> Add UI hook for distilling web pages for test shell.
> 
> This adds the Java hooks needed and a menu option to distill the current
> web page in the test shell.
> 
> BUG=319881
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/185113002

TBR=nyquist@chromium.org

Review URL: https://codereview.chromium.org/187453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254958 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 2 insertions, 33 deletions

diff --git a/chrome/android/shell/res/menu/main_menu.xml b/chrome/android/shell/res/menu/main_menu.xml
index 09d2114..4235001 100644
--- a/chrome/android/shell/res/menu/main_menu.xml
+++ b/chrome/android/shell/res/menu/main_menu.xml
@@ -12,8 +12,6 @@
               android:title="@string/signin_sign_in" />
         <item android:id="@+id/print"
               android:title="@string/print_menu" />
-        <item android:id="@+id/distill_page"
-              android:title="@string/distill_page_menu" />
     </group>
 
     <group android:id="@+id/PHONE_ICON_MENU_ITEMS"
diff --git a/chrome/android/shell/res/values/strings.xml b/chrome/android/shell/res/values/strings.xml
index df212c1..1081327 100644
--- a/chrome/android/shell/res/values/strings.xml
+++ b/chrome/android/shell/res/values/strings.xml
@@ -15,6 +15,5 @@
     <string name="signout_title">Do you want to sign out?</string>
     <string name="signout_sign_out">Sign out</string>
     <string name="signout_cancel">Cancel</string>
-    <string name="distill_page_menu">Distill page</string>
     <string name="browser_process_initialization_failed">Initialization failed.</string>
 </resources>
diff --git a/chrome/android/testshell/java/DEPS b/chrome/android/testshell/java/DEPS
index fcb5e7b..0d019e1 100644
--- a/chrome/android/testshell/java/DEPS
+++ b/chrome/android/testshell/java/DEPS
@@ -1,4 +1,3 @@
 include_rules = [
-  "+components/dom_distiller/android/java",
   "+content/public/android/java",
 ]
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
index 349afc1..f82d707 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java
@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.printing.PrintingControllerFactory;
 import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.shell.sync.SyncController;
-import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content.browser.ActivityContentVideoViewClient;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.ContentView;
@@ -43,7 +42,6 @@ import org.chromium.ui.base.WindowAndroid;
  */
 public class ChromiumTestShellActivity extends Activity implements AppMenuPropertiesDelegate {
     private static final String TAG = "ChromiumTestShellActivity";
-    private static final String CHROME_DISTILLER_SCHEME = "chrome-distiller";
 
     private WindowAndroid mWindow;
     private TabManager mTabManager;
@@ -235,12 +233,6 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper
                     mPrintingController.startPrint(new TabPrinter(getActiveTab()));
                 }
                 return true;
-            case R.id.distill_page:
-                TestShellTab activeTab = getActiveTab();
-                String viewUrl = DomDistillerUrlUtils.getDistillerViewUrlFromUrl(
-                        CHROME_DISTILLER_SCHEME, getActiveTab().getUrl());
-                activeTab.loadUrlWithSanitization(viewUrl);
-                return true;
             case R.id.back_menu_id:
                 if (getActiveTab().canGoBack()) getActiveTab().goBack();
                 return true;
@@ -291,9 +283,6 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper
 
         menu.findItem(R.id.print).setVisible(ApiCompatibilityUtils.isPrintingSupported());
 
-        menu.findItem(R.id.distill_page).setVisible(
-                CommandLine.getInstance().hasSwitch(TestShellSwitches.ENABLE_DOM_DISTILLER));
-
         menu.setGroupVisible(R.id.MAIN_MENU, true);
     }
 
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellSwitches.java b/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellSwitches.java
deleted file mode 100644
index 809661a..0000000
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellSwitches.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 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.
-
-package org.chromium.chrome.shell;
-
-/**
- * Command line switches for the shell.
- */
-public abstract class TestShellSwitches {
-    // Enable the DOM Distiller.
-    public static final String ENABLE_DOM_DISTILLER = "enable-dom-distiller";
-}
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 1c4b0b8..446a99d 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -62,7 +62,6 @@
 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
 #include "components/autofill/core/browser/android/component_jni_registrar.h"
-#include "components/dom_distiller/android/component_jni_registrar.h"
 #include "components/navigation_interception/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
 
@@ -77,7 +76,6 @@ namespace android {
 
 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
   // Register JNI for components we depend on.
-  { "DomDistiller", dom_distiller::android::RegisterDomDistiller },
   { "NavigationInterception",
     navigation_interception::RegisterNavigationInterceptionJni },
   { "WebContentsDelegateAndroid",
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 4f1adde..8292d4b 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -49,11 +49,10 @@
       'target_name': 'chromium_testshell',
       'type': 'none',
       'dependencies': [
-        'chrome_java',
+        '../media/media.gyp:media_java',
+        'chrome.gyp:chrome_java',
         'chromium_testshell_paks',
         'libchromiumtestshell',
-        '../components/components.gyp:dom_distiller_core_java',
-        '../media/media.gyp:media_java',
       ],
       'variables': {
         'apk_name': 'ChromiumTestShell',