| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.content.browser; | 5 package org.chromium.content.browser; |
| 6 | 6 |
| 7 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; | 7 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; |
| 8 | 8 |
| 9 import android.test.suitebuilder.annotation.SmallTest; | 9 import android.support.test.filters.SmallTest; |
| 10 | 10 |
| 11 import junit.framework.Assert; | 11 import junit.framework.Assert; |
| 12 | 12 |
| 13 import org.chromium.base.annotations.SuppressFBWarnings; | 13 import org.chromium.base.annotations.SuppressFBWarnings; |
| 14 import org.chromium.base.test.util.CommandLineFlags; | 14 import org.chromium.base.test.util.CommandLineFlags; |
| 15 import org.chromium.base.test.util.Feature; | 15 import org.chromium.base.test.util.Feature; |
| 16 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; | 16 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; |
| 17 import org.chromium.content_public.browser.LoadUrlParams; | 17 import org.chromium.content_public.browser.LoadUrlParams; |
| 18 | 18 |
| 19 import java.lang.annotation.ElementType; | 19 import java.lang.annotation.ElementType; |
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 984 executeJavaScript("testObject1.method()"); | 984 executeJavaScript("testObject1.method()"); |
| 985 assertEquals(1, mTestController.waitForIntValue()); | 985 assertEquals(1, mTestController.waitForIntValue()); |
| 986 executeJavaScript("testObject2.method()"); | 986 executeJavaScript("testObject2.method()"); |
| 987 assertEquals(2, mTestController.waitForIntValue()); | 987 assertEquals(2, mTestController.waitForIntValue()); |
| 988 executeJavaScript("testObject1.method.call(testObject2)"); | 988 executeJavaScript("testObject1.method.call(testObject2)"); |
| 989 assertEquals(2, mTestController.waitForIntValue()); | 989 assertEquals(2, mTestController.waitForIntValue()); |
| 990 executeJavaScript("testObject2.method.call(testObject1)"); | 990 executeJavaScript("testObject2.method.call(testObject1)"); |
| 991 assertEquals(1, mTestController.waitForIntValue()); | 991 assertEquals(1, mTestController.waitForIntValue()); |
| 992 } | 992 } |
| 993 } | 993 } |
| OLD | NEW |