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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254929

[nyquist, 2014-03-01 00:41:55]

cjhopman: PTAL

[cjhopman, 2014-03-03 16:54:45]

I don't like that we are requiring users of dom_distiller stuff to know the
scheme, but I don't really have a good solution for that.

lgtm

https://codereview.chromium.org/185113002/diff/1/chrome/chrome_android.gypi
File chrome/chrome_android.gypi (right):

https://codereview.chromium.org/185113002/diff/1/chrome/chrome_android.gypi#n...
chrome/chrome_android.gypi:56:
'../components/components.gyp:dom_distiller_core_java',
sort these dependencies

https://codereview.chromium.org/185113002/diff/1/components/dom_distiller.gypi
File components/dom_distiller.gypi (right):

https://codereview.chromium.org/185113002/diff/1/components/dom_distiller.gyp...
components/dom_distiller.gypi:172: 'jni_generator_ptr_type': 'long',
check if `long` is the default.

[nyquist, 2014-03-03 23:17:06]

https://codereview.chromium.org/185113002/diff/1/chrome/chrome_android.gypi
File chrome/chrome_android.gypi (right):

https://codereview.chromium.org/185113002/diff/1/chrome/chrome_android.gypi#n...
chrome/chrome_android.gypi:56:
'../components/components.gyp:dom_distiller_core_java',
On 2014/03/03 16:54:46, cjhopman wrote:
> sort these dependencies

Done.

https://codereview.chromium.org/185113002/diff/1/components/dom_distiller.gypi
File components/dom_distiller.gypi (right):

https://codereview.chromium.org/185113002/diff/1/components/dom_distiller.gyp...
components/dom_distiller.gypi:172: 'jni_generator_ptr_type': 'long',
On 2014/03/03 16:54:46, cjhopman wrote:
> check if `long` is the default.

Yes, it is. Thanks.

[nyquist, 2014-03-03 23:17:20]

The CQ bit was checked by nyquist@chromium.org

[nyquist, 2014-03-03 23:17:22]

The CQ bit was unchecked by nyquist@chromium.org

[nyquist, 2014-03-03 23:17:37]

The CQ bit was checked by nyquist@chromium.org

[commit-bot: I haz the power, 2014-03-03 23:23:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/60001

[commit-bot: I haz the power, 2014-03-04 00:10:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-04 00:10:26]

Retried try job too often on win for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...

[nyquist, 2014-03-04 00:48:16]

The CQ bit was checked by nyquist@chromium.org

[commit-bot: I haz the power, 2014-03-04 00:50:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/60001

[commit-bot: I haz the power, 2014-03-04 08:38:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-04 08:38:24]

The commit queue went berserk retrying too often for a
seemingly flaky test on builder android_dbg:
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[nyquist, 2014-03-04 14:52:00]

The CQ bit was checked by nyquist@chromium.org

[commit-bot: I haz the power, 2014-03-04 14:52:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/60001

[commit-bot: I haz the power, 2014-03-04 14:52:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-04 14:52:15]

Failed to apply patch for
chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index:
chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
  |diff --git
a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
  |index
69ab9e679fb42c223db9109d59aefdbaa48f8bfc..a321642cd0d8e2b7755fdf7f5f6b2a8da21b79f5
100644
  |---
a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
  |+++
b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
  --------------------------
  No file to patch.  Skipping patch.
  4 out of 4 hunks ignored

Patch:      
chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
Index:
chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git
a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index
69ab9e679fb42c223db9109d59aefdbaa48f8bfc..a321642cd0d8e2b7755fdf7f5f6b2a8da21b79f5
100644
---
a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++
b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -28,6 +28,7 @@ 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.testshell.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;
@@ -42,6 +43,7 @@ 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;
@@ -233,6 +235,12 @@ 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;
@@ -283,6 +291,9 @@ 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);
     }

[nyquist, 2014-03-04 16:15:46]

The CQ bit was checked by nyquist@chromium.org

[nyquist, 2014-03-04 16:15:50]

The CQ bit was unchecked by nyquist@chromium.org

[nyquist, 2014-03-04 16:40:02]

The CQ bit was checked by nyquist@chromium.org

[commit-bot: I haz the power, 2014-03-04 16:40:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/80001

[commit-bot: I haz the power, 2014-03-04 20:22:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-04 20:22:54]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[aurimas (slooooooooow), 2014-03-04 22:38:56]

The CQ bit was checked by aurimas@chromium.org

[commit-bot: I haz the power, 2014-03-04 22:39:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/80001

[commit-bot: I haz the power, 2014-03-05 00:25:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-05 00:25:25]

Retried try job too often on win_rel for step(s) base_unittests, browser_tests,
interactive_ui_tests, net_unittests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[nyquist, 2014-03-05 01:09:34]

The CQ bit was checked by nyquist@chromium.org

[commit-bot: I haz the power, 2014-03-05 01:38:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nyquist@chromium.org/185113002/80001

[commit-bot: I haz the power, 2014-03-05 02:25:32]

Change committed as 254929

[boliu, 2014-03-05 04:23:17]

I think this broke android unit_tests.

[nyquist, 2014-03-05 06:26:39]

Reverted in https://codereview.chromium.org/187453003/

[nyquist, 2014-03-05 18:14:22]

Updated CL with fix in: https://codereview.chromium.org/183893029/