Enable NeedsBraces check and fix some checkstyle issues.

android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java

Index: android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
index 83a1b3d443e154726056d7e2b3d585221944e69a..a5217922147222298e3967df31835bc5dab6fbe6 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/test/TestContentProvider.java
@@ -34,7 +34,7 @@ public class TestContentProvider extends ContentProvider {
     private static final String TAG = "TestContentProvider";
     private enum ColumnIndex {
         RESOURCE_REQUEST_COUNT_COLUMN,
-    };
+    }
     private final Map<String, Integer> mResourceRequestCount;
 
     public static String createContentUrl(String target) {
@@ -186,8 +186,8 @@ public class TestContentProvider extends ContentProvider {
         String resource = uri.getQuery();
         if (GET_RESOURCE_REQUEST_COUNT.equals(action)) {
             return new ProviderStateCursor(
-                mResourceRequestCount.containsKey(resource) ?
-                mResourceRequestCount.get(resource) : 0);
+                mResourceRequestCount.containsKey(resource)
+                    ? mResourceRequestCount.get(resource) : 0);
         } else if (RESET_RESOURCE_REQUEST_COUNT.equals(action)) {
             mResourceRequestCount.put(resource, 0);
         }