Fixing Java style issues in android_webview.

android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 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.android_webview;
 
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.util.Log;
 import android.util.TypedValue;
@@ skipping 48 matching lines @@
 
     private static int getFieldId(Context context, String assetType, String assetName)
         throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
         Class<?> d = context.getClassLoader()
             .loadClass(context.getPackageName() + ".R$" + assetType);
         java.lang.reflect.Field field = d.getField(assetName);
         int id = field.getInt(null);
         return id;
     }
 
-    private static int getValueType(Context context, int field_id) {
-      TypedValue value = new TypedValue();
-      context.getResources().getValue(field_id, value, true);
-      return value.type;
+    private static int getValueType(Context context, int fieldId) {
+        TypedValue value = new TypedValue();
+        context.getResources().getValue(fieldId, value, true);
+        return value.type;
     }
 
     private static InputStream openResource(Context context, Uri uri) {
-        assert(uri.getScheme().equals(FILE_SCHEME));
-        assert(uri.getPath() != null);
-        assert(uri.getPath().startsWith(nativeGetAndroidResourcePath()));
+        assert uri.getScheme().equals(FILE_SCHEME);
+        assert uri.getPath() != null;
+        assert uri.getPath().startsWith(nativeGetAndroidResourcePath());
         // The path must be of the form "/android_res/asset_type/asset_name.ext".
         List<String> pathSegments = uri.getPathSegments();
         if (pathSegments.size() != 3) {
             Log.e(TAG, "Incorrect resource path: " + uri);
             return null;
         }
         String assetPath = pathSegments.get(0);
         String assetType = pathSegments.get(1);
         String assetName = pathSegments.get(2);
         if (!("/" + assetPath + "/").equals(nativeGetAndroidResourcePath())) {
             Log.e(TAG, "Resource path does not start with " + nativeGetAndroidResourcePath() +
                   ": " + uri);
             return null;
         }
         // Drop the file extension.
         assetName = assetName.split("\\.")[0];
         try {
             // Use the application context for resolving the resource package name so that we do
             // not use the browser's own resources. Note that if 'context' here belongs to the
             // test suite, it does not have a separate application context. In that case we use
             // the original context object directly.
             if (context.getApplicationContext() != null) {
                 context = context.getApplicationContext();
             }
-            int field_id = getFieldId(context, assetType, assetName);
-            int value_type = getValueType(context, field_id);
-            if (value_type == TypedValue.TYPE_STRING) {
-                return context.getResources().openRawResource(field_id);
+            int fieldId = getFieldId(context, assetType, assetName);
+            int valueType = getValueType(context, fieldId);
+            if (valueType == TypedValue.TYPE_STRING) {
+                return context.getResources().openRawResource(fieldId);
             } else {
                 Log.e(TAG, "Asset not of type string: " + uri);
                 return null;
             }
         } catch (ClassNotFoundException e) {
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
             return null;
         } catch (NoSuchFieldException e) {
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
             return null;
         } catch (IllegalAccessException e) {
             Log.e(TAG, "Unable to open resource URL: " + uri, e);
             return null;
         }
     }
 
     private static InputStream openAsset(Context context, Uri uri) {
-        assert(uri.getScheme().equals(FILE_SCHEME));
-        assert(uri.getPath() != null);
-        assert(uri.getPath().startsWith(nativeGetAndroidAssetPath()));
+        assert uri.getScheme().equals(FILE_SCHEME);
+        assert uri.getPath() != null;
+        assert uri.getPath().startsWith(nativeGetAndroidAssetPath());
         String path = uri.getPath().replaceFirst(nativeGetAndroidAssetPath(), "");
         try {
             AssetManager assets = context.getAssets();
             return assets.open(path, AssetManager.ACCESS_STREAMING);
         } catch (IOException e) {
             Log.e(TAG, "Unable to open asset URL: " + uri);
             return null;
         }
     }
 
     private static InputStream openContent(Context context, Uri uri) {
-        assert(uri.getScheme().equals(CONTENT_SCHEME));
+        assert uri.getScheme().equals(CONTENT_SCHEME);
         try {
             return context.getContentResolver().openInputStream(uri);
         } catch (Exception e) {
             Log.e(TAG, "Unable to open content URL: " + uri);
             return null;
         }
     }
 
     /**
      * Determine the mime type for an Android resource.
@@ skipping 57 matching lines @@
      *                context.
      */
     public static void setResourceContextForTesting(Context context) {
         nativeSetResourceContextForTesting(context);
     }
 
     private static native void nativeSetResourceContextForTesting(Context context);
     private static native String nativeGetAndroidAssetPath();
     private static native String nativeGetAndroidResourcePath();
 }