Navigation transitions (web to native app): Clear navigation transition data

content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java

 // 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.content.browser;
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 import android.util.Pair;
 
@@ skipping 108 matching lines @@
         contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
         loadUrl(contentViewCore.getWebContents().getNavigationController(),
                 testCallbackHelperContainer, new LoadUrlParams(URL_1));
 
         assertTrue("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
     }
 
     /**
      * Tests that the listener does not receive DidDeferAfterResponseStarted if we specify that
-     * the transition is handled.
+     * the transition is not handled.
      */
     @SmallTest
     public void testDidDeferAfterResponseStartedNotCalled() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
 
         contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
         TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(
                 contentViewCore.getWebContents(),
                 false);
         contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
         loadUrl(contentViewCore.getWebContents().getNavigationController(),
                 testCallbackHelperContainer, new LoadUrlParams(URL_1));
 
         assertFalse("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
     }
 
     /**
+     * Tests clearNavigationTransitionData(). The listener does not receive
+     * DidDeferAfterResponseStarted even if we specify that the transition is handled
+     * because the data is cleared before the navigation.
+     */
+    @SmallTest
+    public void testDidDeferAfterResponseStartedNotCalledWithoutData() throws Throwable {
+        ContentShellActivity activity = launchContentShellWithUrl(URL_1);
+        waitForActiveShellToBeDoneLoading();
+        ContentViewCore contentViewCore = activity.getActiveContentViewCore();
+        TestCallbackHelperContainer testCallbackHelperContainer =
+                new TestCallbackHelperContainer(contentViewCore);
+
+        contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
+        TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(
+                contentViewCore.getWebContents(),
+                true);
+        contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
+
+        contentViewCore.getWebContents().clearNavigationTransitionData();
+        loadUrl(contentViewCore.getWebContents().getNavigationController(),
+                testCallbackHelperContainer, new LoadUrlParams(URL_1));
+
+        assertFalse("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
+    }
+
+    /**
      * Tests that the resource handler doesn't query the listener if no transition is pending.
      */
     @SmallTest
     public void testWillHandleDeferAfterResponseStartedNotCalled() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
 
@@ skipping 141 matching lines @@
 
             assertTrue("X-Transition-Entering-Color parsed correctly.",
                     TextUtils.equals(
                             delegate.getTransitionEnteringColor(),
                             transitionEnteringColor));
         } finally {
             webServer.shutdown();
         }
     }
 }