content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java - Issue 744453002: Fix a bunch of Java Checkstyle issues.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java

Issue 744453002: Fix a bunch of Java Checkstyle issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java » ('j') | net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java

index 3241d2f130c267ea215b7bad4747441600b00376..d5cd46d861c3dc90d0c3cb1008d70c6c81c20cff 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java

@@ -64,12 +64,11 @@ public class JavaBridgeChildFrameTest extends JavaBridgeTestBase {

"<html><body><iframe></iframe></body></html>", "text/html", false);

// In case there is anything wrong with the JS wrapper, an attempt

// to look up its properties will result in an exception being thrown.

- String script =

- "(function(){ try {" +

- " return typeof testController.setStringValue;" +

- "} catch (e) {" +

- " return e.toString();" +

- "} })()";

+ String script = "(function(){ try {"

+ + " return typeof testController.setStringValue;"

+ + "} catch (e) {"

+ + " return e.toString();"

+ + "} })()";

assertEquals("\"function\"",

executeJavaScriptAndGetResult(getWebContents(), script));

// Make sure calling a method also works.

@@ -86,15 +85,15 @@ public class JavaBridgeChildFrameTest extends JavaBridgeTestBase {

// Test by setting a custom property on the parent page's injected

// object and then checking that child frame doesn't see the property.

loadDataSync(getWebContents().getNavigationController(),

- "<html><head>" +

- "<script>" +

- " window.wProperty = 42;" +

- " testController.tcProperty = 42;" +

- " function queryProperties(w) {" +

- " return w.wProperty + ' / ' + w.testController.tcProperty;" +

- " }" +

- "</script>" +

- "</head><body><iframe></iframe></body></html>", "text/html", false);

+ "<html><head>"

+ + "<script>"

Ted C 2014/11/20 00:27:33 I take it these can not be aligned with the "<html

aurimas (slooooooooow) 2014/11/20 01:21:59 Normally we indent because it is a line wrap. Does

+ + " window.wProperty = 42;"

+ + " testController.tcProperty = 42;"

+ + " function queryProperties(w) {"

+ + " return w.wProperty + ' / ' + w.testController.tcProperty;"

+ + " }"

+ + "</script>"

+ + "</head><body><iframe></iframe></body></html>", "text/html", false);

assertEquals("\"42 / 42\"",

executeJavaScriptAndGetResult(getWebContents(), "queryProperties(window)"));

assertEquals("\"undefined / undefined\"",