Fix a bunch of Java Checkstyle issues.

BUG=318404
TBR=samuong@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#305047}

2 files changed, 24 insertions, 26 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
index 168533b..b34b7fe 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java
@@ -190,7 +190,7 @@ public final class AwCookieManager {
             mHandler = handler;
         }
 
-        public static<T> CookieCallback<T> convert(ValueCallback<T> callback) throws
+        public static <T> CookieCallback<T> convert(ValueCallback<T> callback) throws
                 IllegalStateException {
             if (callback == null) return null;
             if (Looper.myLooper() == null) {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
index 2930d39..40cf038 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
@@ -207,19 +207,18 @@ public class AndroidViewIntegrationTest extends AwTestBase {
     private String makeHtmlPageOfSize(int widthCss, int heightCss, boolean heightPercent) {
         String content = "<div class=\"normal\">a</div>";
         if (heightPercent) content += "<div class=\"heightPercent\"></div>";
-        return CommonResources.makeHtmlPageFrom(
-            "<style type=\"text/css\">" +
-                "body { margin:0px; padding:0px; } " +
-                ".normal { " +
-                   "width:" + widthCss + "px; " +
-                   "height:" + heightCss + "px; " +
-                   "background-color: red; " +
-                 "} " +
-                 ".heightPercent { " +
-                   "height: 150%; " +
-                   "background-color: blue; " +
-                 "} " +
-            "</style>", content);
+        return CommonResources.makeHtmlPageFrom("<style type=\"text/css\">"
+                + "  body { margin:0px; padding:0px; } "
+                + "  .normal { "
+                + "    width:" + widthCss + "px; "
+                + "    height:" + heightCss + "px; "
+                + "    background-color: red; "
+                + "  } "
+                + "  .heightPercent { "
+                + "    height: 150%; "
+                + "    background-color: blue; "
+                + "  } "
+                + "</style>", content);
     }
 
     private void waitForContentSizeToChangeTo(OnContentSizeChangedHelper helper, int callCount,
@@ -227,8 +226,8 @@ public class AndroidViewIntegrationTest extends AwTestBase {
         final int maxSizeChangeNotificationsToWaitFor = 5;
         for (int i = 1; i <= maxSizeChangeNotificationsToWaitFor; i++) {
             helper.waitForCallback(callCount, i);
-            if ((heightCss == -1 || helper.getHeight() == heightCss) &&
-                    (widthCss == -1 || helper.getWidth() == widthCss)) {
+            if ((heightCss == -1 || helper.getHeight() == heightCss)
+                    && (widthCss == -1 || helper.getWidth() == widthCss)) {
                 break;
             }
             // This means that we hit the max number of iterations but the expected contents size
@@ -282,16 +281,15 @@ public class AndroidViewIntegrationTest extends AwTestBase {
         final int widthCss = 142;
         final int heightCss = 180;
 
-        final String htmlData = CommonResources.makeHtmlPageFrom(
-                "<style type=\"text/css\">" +
-                "  body { margin:0px; padding:0px; } " +
-                "  div { " +
-                "    position: absolute; " +
-                "    width:" + widthCss + "px; " +
-                "    height:" + heightCss + "px; " +
-                "    background-color: red; " +
-                "  } " +
-                "</style>", "<div>a</div>");
+        final String htmlData = CommonResources.makeHtmlPageFrom("<style type=\"text/css\">"
+                + "  body { margin:0px; padding:0px; } "
+                + "  div { "
+                + "    position: absolute; "
+                + "    width:" + widthCss + "px; "
+                + "    height:" + heightCss + "px; "
+                + "    background-color: red; "
+                + "  } "
+                + "</style>", "<div>a</div>");
 
         final int contentSizeChangeCallCount = mOnContentSizeChangedHelper.getCallCount();
         loadDataAsync(testContainerView.getAwContents(), htmlData, "text/html", false);