Fixing Java style issues in content/

BUG=320711
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239989 0039d316-1c4b-4281-b951-d872f2087c98

146 files changed, 386 insertions, 371 deletions

diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index 11441de..2898d42 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -125,8 +125,9 @@ public class ChildProcessService extends Service {
 
                     if (useLinker) {
                         synchronized (mMainThread) {
-                            while (!mIsBound)
+                            while (!mIsBound) {
                                 mMainThread.wait();
+                            }
                         }
                         if (mLinkerParams != null) {
                             if (mLinkerParams.mWaitForSharedRelro)
@@ -245,9 +246,9 @@ public class ChildProcessService extends Service {
         Surface surface = null;
         boolean needRelease = false;
         if (surfaceObject instanceof Surface) {
-            surface = (Surface)surfaceObject;
+            surface = (Surface) surfaceObject;
         } else if (surfaceObject instanceof SurfaceTexture) {
-            surface = new Surface((SurfaceTexture)surfaceObject);
+            surface = new Surface((SurfaceTexture) surfaceObject);
             needRelease = true;
         } else {
             Log.e(TAG, "Not a valid surfaceObject: " + surfaceObject);
diff --git a/content/public/android/java/src/org/chromium/content/app/ContentApplication.java b/content/public/android/java/src/org/chromium/content/app/ContentApplication.java
index 97b6a48..e0f49a9 100644
--- a/content/public/android/java/src/org/chromium/content/app/ContentApplication.java
+++ b/content/public/android/java/src/org/chromium/content/app/ContentApplication.java
@@ -53,13 +53,13 @@ public class ContentApplication extends BaseChromiumApplication {
      */
     @Override
     public void onTerminate() {
-      try {
-          getTracingController().unregisterReceiver(this);
-      } catch (SecurityException e) {
-          // Happens if the process is isolated. Ignore.
-      }
+        try {
+            getTracingController().unregisterReceiver(this);
+        } catch (SecurityException e) {
+            // Happens if the process is isolated. Ignore.
+        }
 
-      super.onTerminate();
+        super.onTerminate();
     }
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/ContentMain.java b/content/public/android/java/src/org/chromium/content/app/ContentMain.java
index 09ba783..9fe23e1 100644
--- a/content/public/android/java/src/org/chromium/content/app/ContentMain.java
+++ b/content/public/android/java/src/org/chromium/content/app/ContentMain.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -13,7 +13,7 @@ import org.chromium.base.JNINamespace;
  * content/public/app/content_main.h which is not used in Android as it has
  * the different initialization process.
  *
- * TODO (michaelbai): Refactorying the BrowserProcessMain.java and the
+ * TODO(michaelbai): Refactorying the BrowserProcessMain.java and the
  * ChildProcessService.java to start ContentMain, and run the process
  * specific initialization code in ContentMainRunner::Initialize.
  *
@@ -36,4 +36,4 @@ public class ContentMain {
 
     private static native void nativeInitApplicationContext(Context context);
     private static native int nativeStart();
-};
+}
diff --git a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
index 9902495..83d4435 100644
--- a/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
+++ b/content/public/android/java/src/org/chromium/content/app/LibraryLoader.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/app/Linker.java b/content/public/android/java/src/org/chromium/content/app/Linker.java
index 81c89b8..8b78d06 100644
--- a/content/public/android/java/src/org/chromium/content/app/Linker.java
+++ b/content/public/android/java/src/org/chromium/content/app/Linker.java
@@ -88,7 +88,7 @@ import java.util.Map;
  *   library per APK.
  */
 
-/*
+/**
  * Here's an explanation of how this class is supposed to be used:
  *
  *  - Native shared libraries should be loaded with Linker.loadLibrary(),
@@ -329,7 +329,7 @@ public class Linker {
     /**
      * Call this method before any other Linker method to force a specific
      * memory device configuration. Should only be used for testing.
-     * @param config either MEMORY_DEVICE_CONFIG_LOW or MEMORY_DEVICE_CONFIG_NORMAL.
+     * @param memoryDeviceConfig either MEMORY_DEVICE_CONFIG_LOW or MEMORY_DEVICE_CONFIG_NORMAL.
      */
     public static void setMemoryDeviceConfig(int memoryDeviceConfig) {
         if (DEBUG) Log.i(TAG, "setMemoryDeviceConfig(" + memoryDeviceConfig + ") called");
@@ -390,7 +390,7 @@ public class Linker {
      * Note that when in a service process, this will block until the RELRO bundle is
      * received, i.e. when another thread calls useSharedRelros().
      */
-     public static void finishLibraryLoad() {
+    public static void finishLibraryLoad() {
         if (DEBUG) Log.i(TAG, "finishLibraryLoad() called");
         synchronized (Linker.class) {
             if (DEBUG) Log.i(TAG, String.format(
@@ -457,7 +457,7 @@ public class Linker {
             }
         }
         if (DEBUG) Log.i(TAG, "finishLibraryLoad() exiting");
-     }
+    }
 
     /**
      * Call this to send a Bundle containing the shared RELRO sections to be
@@ -568,11 +568,11 @@ public class Linker {
             sBaseLoadAddress = address;
             sCurrentLoadAddress = address;
             if (address == 0) {
-              // If the computed address is 0, there are issues with the
-              // entropy source, so disable RELRO shared / fixed load addresses.
-              Log.w(TAG, "Disabling shared RELROs due to bad entropy sources");
-              sBrowserUsesSharedRelro = false;
-              sWaitForSharedRelros = false;
+                // If the computed address is 0, there are issues with the
+                // entropy source, so disable RELRO shared / fixed load addresses.
+                Log.w(TAG, "Disabling shared RELROs due to bad entropy sources");
+                sBrowserUsesSharedRelro = false;
+                sWaitForSharedRelros = false;
             }
         }
     }
@@ -598,7 +598,7 @@ public class Linker {
 
         // The maximum limit of the desired random offset.
         final long pageSize = nativeGetPageSize();
-        final int offsetLimit = (int)((baseAddressMax - baseAddress) / pageSize);
+        final int offsetLimit = (int) ((baseAddressMax - baseAddress) / pageSize);
 
         // Get the greatest power of 2 that is smaller or equal to offsetLimit.
         int numBits = 30;
@@ -651,8 +651,9 @@ public class Linker {
 
         int result = 0;
         try {
-            for (int n = 0; n < 4; n++)
+            for (int n = 0; n < 4; n++) {
                 result = (result << 8) | (input.read() & 255);
+            }
         } catch (Exception e) {
             Log.e(TAG, "Could not read /dev/urandom", e);
             return -1;
@@ -682,7 +683,7 @@ public class Linker {
      * Use the shared RELRO section from a Bundle received form another process.
      * Call this after calling setBaseLoadAddress() then loading all libraries
      * with loadLibrary().
-     * @param a Bundle instance generated with createSharedRelroBundle() in
+     * @param bundle Bundle instance generated with createSharedRelroBundle() in
      * another process.
      */
     private static void useSharedRelrosLocked(Bundle bundle) {
@@ -741,7 +742,6 @@ public class Linker {
      * previously, this uses the standard linker (i.e. System.loadLibrary()).
      *
      * @param library The library's base name.
-     * @throws UnsatisfiedLinkError if the library does not exist.
      */
     public static void loadLibrary(String library) {
         if (DEBUG) Log.i(TAG, "loadLibrary: " + library);
@@ -775,7 +775,6 @@ public class Linker {
             }
 
             LibInfo libInfo = new LibInfo();
-            LibInfo relroLibInfo = null;
             long loadAddress = 0;
             if ((sInBrowserProcess && sBrowserUsesSharedRelro) || sWaitForSharedRelros) {
                 // Load the library at a fixed address.
@@ -808,10 +807,8 @@ public class Linker {
             if (sInBrowserProcess) {
                 // Create a new shared RELRO section at the 'current' fixed load address.
                 if (!nativeCreateSharedRelro(libName, sCurrentLoadAddress, libInfo)) {
-                  Log.w(TAG,
-                      String.format(
-                          "Could not create shared RELRO for %s at %x",
-                          libName, sCurrentLoadAddress));
+                    Log.w(TAG, String.format("Could not create shared RELRO for %s at %x",
+                            libName, sCurrentLoadAddress));
                 } else {
                     if (DEBUG) Log.i(TAG,
                         String.format(
@@ -839,12 +836,12 @@ public class Linker {
      * Native method used to load a library.
      * @param library Platform specific library name (e.g. libfoo.so)
      * @param loadAddress Explicit load address, or 0 for randomized one.
-     * @param relro_info If not null, the mLoadAddress and mLoadSize fields
+     * @param libInfo If not null, the mLoadAddress and mLoadSize fields
      * of this LibInfo instance will set on success.
      * @return true for success, false otherwise.
      */
     private static native boolean nativeLoadLibrary(String library,
-                                                    long  loadAddress,
+                                                    long loadAddress,
                                                     LibInfo libInfo);
 
     /**
@@ -856,7 +853,7 @@ public class Linker {
      * @param library Library name.
      * @param loadAddress load address, which can be different from the one
      * used to load the library in the current process!
-     * @param LibInfo libInfo instance. On success, the mRelroStart, mRelroSize
+     * @param libInfo libInfo instance. On success, the mRelroStart, mRelroSize
      * and mRelroFd will be set.
      * @return true on success, false otherwise.
      */
@@ -903,11 +900,11 @@ public class Linker {
 
         public void close() {
             if (mRelroFd >= 0) {
-              try {
-                  ParcelFileDescriptor.adoptFd(mRelroFd).close();
-              } catch (java.io.IOException e) {
-              }
-              mRelroFd = -1;
+                try {
+                    ParcelFileDescriptor.adoptFd(mRelroFd).close();
+                } catch (java.io.IOException e) {
+                }
+                mRelroFd = -1;
             }
         }
 
@@ -946,17 +943,20 @@ public class Linker {
         }
 
         // from Parcelable
-        public static final Parcelable.Creator<LibInfo> CREATOR
-                = new Parcelable.Creator<LibInfo>() {
-            public LibInfo createFromParcel(Parcel in) {
-                return new LibInfo(in);
-            }
+        public static final Parcelable.Creator<LibInfo> CREATOR =
+                new Parcelable.Creator<LibInfo>() {
+                    @Override
+                    public LibInfo createFromParcel(Parcel in) {
+                        return new LibInfo(in);
+                    }
 
-            public LibInfo[] newArray(int size) {
-                return new LibInfo[size];
-            }
-        };
+                    @Override
+                    public LibInfo[] newArray(int size) {
+                        return new LibInfo[size];
+                    }
+                };
 
+        @Override
         public String toString() {
             return String.format("[load=0x%x-0x%x relro=0x%x-0x%x fd=%d]",
                                  mLoadAddress,
@@ -978,8 +978,9 @@ public class Linker {
     // Create a Bundle from a map of LibInfo objects.
     private static Bundle createBundleFromLibInfoMap(HashMap<String, LibInfo> map) {
         Bundle bundle = new Bundle(map.size());
-        for (Map.Entry<String, LibInfo> entry : map.entrySet())
+        for (Map.Entry<String, LibInfo> entry : map.entrySet()) {
             bundle.putParcelable(entry.getKey(), entry.getValue());
+        }
 
         return bundle;
     }
@@ -988,16 +989,17 @@ public class Linker {
     private static HashMap<String, LibInfo> createLibInfoMapFromBundle(Bundle bundle) {
         HashMap<String, LibInfo> map = new HashMap<String, LibInfo>();
         for (String library : bundle.keySet()) {
-          LibInfo libInfo = bundle.getParcelable(library);
-          map.put(library, libInfo);
+            LibInfo libInfo = bundle.getParcelable(library);
+            map.put(library, libInfo);
         }
         return map;
     }
 
     // Call the close() method on all values of a LibInfo map.
     private static void closeLibInfoMap(HashMap<String, LibInfo> map) {
-        for (Map.Entry<String, LibInfo> entry : map.entrySet())
+        for (Map.Entry<String, LibInfo> entry : map.entrySet()) {
             entry.getValue().close();
+        }
     }
 
     // The map of libraries that are currently loaded in this process.
diff --git a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService.java b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService.java
index 49ce280..5cff15b 100644
--- a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService.java
@@ -1,13 +1,13 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.content.app;
 
-// Privleged (unsandboxed) Services inherit from this class. We enforce the
-// privileged/sandboxed distinction by type-checking objects against this parent
-// class.
-
+/**
+ * Privileged (unsandboxed) Services inherit from this class. We enforce the
+ * privileged/sandboxed distinction by type-checking objects against this parent class.
+ */
 public class PrivilegedProcessService extends ChildProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService0.java b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService0.java
index 0520538..a3c9c5b 100644
--- a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService0.java
+++ b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService0.java
@@ -1,12 +1,13 @@
-// 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.content.app;
 
-// This is needed to register multiple PrivilegedProcess services so that we can have
-// more than one privileged process.
-
+/**
+ * This is needed to register multiple PrivilegedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class PrivilegedProcessService0 extends PrivilegedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService1.java b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService1.java
index 47c16e6..bd16f07 100644
--- a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService1.java
+++ b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService1.java
@@ -1,12 +1,13 @@
-// 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.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one privileged process.
-
+/**
+ * This is needed to register multiple PrivilegedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class PrivilegedProcessService1 extends PrivilegedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService2.java b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService2.java
index 16cdd6d..3f40406 100644
--- a/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService2.java
+++ b/content/public/android/java/src/org/chromium/content/app/PrivilegedProcessService2.java
@@ -1,12 +1,13 @@
-// 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.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple PrivilegedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class PrivilegedProcessService2 extends PrivilegedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
index c48f0c3..3a9830f 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// Sandboxed Services inherit from this class. We enforce the privileged/sandboxed
-// distinction by type-checking objects against this parent class.
-
+/**
+ * Sandboxed Services inherit from this class. We enforce the privileged/sandboxed
+ * distinction by type-checking objects against this parent class.
+ */
 public class SandboxedProcessService extends ChildProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService0.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService0.java
index 7074ee1..b2e1e0b 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService0.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService0.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService0 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService1.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService1.java
index 02083f4..c472bd7 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService1.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService1.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService1 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService10.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService10.java
index 828ffde..de293e8 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService10.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService10.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService10 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService11.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService11.java
index 8da928f..06d6f51 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService11.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService11.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService11 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService12.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService12.java
index a2b9fa1..039891c 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService12.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService12.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService12 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService2.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService2.java
index 11b2ae1d..7b3ab02 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService2.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService2.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService2 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService3.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService3.java
index e44b570..c15d7b3 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService3.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService3.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService3 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService4.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService4.java
index 8608b06..68bcabb 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService4.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService4.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService4 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService5.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService5.java
index 16621b82..a4fb995 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService5.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService5.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService5 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService6.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService6.java
index 96a5496..b8ce857 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService6.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService6.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService6 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService7.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService7.java
index 16b28d5..f4eeb6c 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService7.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService7.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService7 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService8.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService8.java
index 17c1e40..f99aa4c 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService8.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService8.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService8 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService9.java b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService9.java
index 91a6f53..5dc15a9 100644
--- a/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService9.java
+++ b/content/public/android/java/src/org/chromium/content/app/SandboxedProcessService9.java
@@ -4,9 +4,10 @@
 
 package org.chromium.content.app;
 
-// This is needed to register multiple SandboxedProcess services so that we can have
-// more than one sandboxed process.
-
+/**
+ * This is needed to register multiple SandboxedProcess services so that we can have
+ * more than one sandboxed process.
+ */
 public class SandboxedProcessService9 extends SandboxedProcessService {
 
 }
diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
index 77229a6..403c906 100644
--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
@@ -177,7 +177,6 @@ public class BrowserStartupController {
      *
      * @param maxRenderers The maximum number of renderer processes the browser may
      *                      create. Zero for single process mode.
-     * @return true if successfully started, false otherwise.
      * @throws ProcessInitException
      */
     public void startBrowserProcessesSync(int maxRenderers) throws ProcessInitException {
@@ -196,7 +195,7 @@ public class BrowserStartupController {
 
         // Startup should now be complete
         assert mStartupDone;
-        if(!mStartupSuccess) {
+        if (!mStartupSuccess) {
             throw new ProcessInitException(ResultCodes.RESULT_CODE_NATIVE_STARTUP_FAILED);
         }
     }
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
index bf5df92..ea21011 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java
@@ -339,18 +339,18 @@ public class ChildProcessLauncher {
 
         ChildProcessConnection.ConnectionCallback connectionCallback =
                 new ChildProcessConnection.ConnectionCallback() {
-            @Override
-            public void onConnected(int pid) {
-                Log.d(TAG, "on connect callback, pid=" + pid + " context=" + clientContext);
-                if (pid != NULL_PROCESS_HANDLE) {
-                    sBindingManager.addNewConnection(pid, connection);
-                    sServiceMap.put(pid, connection);
-                } else {
-                    freeConnection(connection);
-                }
-                nativeOnChildProcessStarted(clientContext, pid);
-            }
-        };
+                    @Override
+                    public void onConnected(int pid) {
+                        Log.d(TAG, "on connect callback, pid=" + pid + " context=" + clientContext);
+                        if (pid != NULL_PROCESS_HANDLE) {
+                            sBindingManager.addNewConnection(pid, connection);
+                            sServiceMap.put(pid, connection);
+                        } else {
+                            freeConnection(connection);
+                        }
+                        nativeOnChildProcessStarted(clientContext, pid);
+                    }
+                };
 
         // TODO(sievers): Revisit this as it doesn't correctly handle the utility process
         // assert callbackType != CALLBACK_FOR_UNKNOWN_PROCESS;
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
index 3a63ba8..f8f0942 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
index 41047ce..89b4e8a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index 3a912eb..2d089d5 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
index cd07115..a7ffe290 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index e465d49..67edddc 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -842,7 +842,7 @@ public class ContentViewCore
         TraceEvent.end();
     }
 
-    private void initPopupZoomer(Context context){
+    private void initPopupZoomer(Context context) {
         mPopupZoomer = new PopupZoomer(context);
         mPopupZoomer.setOnVisibilityChangedListener(new PopupZoomer.OnVisibilityChangedListener() {
             @Override
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
index 9b46c3c..266f7c9 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewDownloadDelegate.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
index 445b5a2..f4c4d89 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,7 +6,6 @@ package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.InputDevice;
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
index 5e0bb3e..797d872 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java
index 68215b9..8e95553 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java b/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
index 197cfe7..1af14d5 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DeviceMotionAndOrientation.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java b/content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java
index f6478db..17c8235 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java
index 5f7ffeb..fdc355b 100644
--- a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -132,7 +132,7 @@ public class DownloadController {
     public void onDownloadUpdated(Context context, String url, String mimeType,
             String filename, String path, long contentLength, boolean successful, int downloadId,
             int percentCompleted, long timeRemainingInMs) {
-        if(sDownloadNotificationService != null) {
+        if (sDownloadNotificationService != null) {
             DownloadInfo downloadInfo = new DownloadInfo.Builder()
             .setUrl(url)
             .setMimeType(mimeType)
diff --git a/content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java b/content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java
index affb314..98d8bda 100644
--- a/content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java
+++ b/content/public/android/java/src/org/chromium/content/browser/FileDescriptorInfo.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java b/content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java
index d66f205..c122796 100644
--- a/content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java
+++ b/content/public/android/java/src/org/chromium/content/browser/HeapStatsLogger.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java b/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
index 06c6846..299e1b3 100644
--- a/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/JavascriptInterface.java b/content/public/android/java/src/org/chromium/content/browser/JavascriptInterface.java
index 4d5cf24..3a313cd 100644
--- a/content/public/android/java/src/org/chromium/content/browser/JavascriptInterface.java
+++ b/content/public/android/java/src/org/chromium/content/browser/JavascriptInterface.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java b/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
index fd52dbb..50599e1 100644
--- a/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
index 3e17ae6..8df5f60 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/LocationProvider.java b/content/public/android/java/src/org/chromium/content/browser/LocationProvider.java
index afcc17a..9c8ac56 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LocationProvider.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LocationProvider.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -158,10 +158,10 @@ class LocationProvider {
                     mLocationManager.requestLocationUpdates(0, 0, criteria, this,
                             ThreadUtils.getUiThreadLooper());
                 }
-            } catch(SecurityException e) {
+            } catch (SecurityException e) {
                 Log.e(TAG, "Caught security exception registering for location updates from " +
                     "system. This should only happen in DumpRenderTree.");
-            } catch(IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 Log.e(TAG, "Caught IllegalArgumentException registering for location updates.");
             }
         }
diff --git a/content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java b/content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java
index c85fefd..9179669 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LongPressDetector.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
index b8f2085..3d02012 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/NavigationClient.java b/content/public/android/java/src/org/chromium/content/browser/NavigationClient.java
index 505d48e..2605851c5 100644
--- a/content/public/android/java/src/org/chromium/content/browser/NavigationClient.java
+++ b/content/public/android/java/src/org/chromium/content/browser/NavigationClient.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/NavigationEntry.java b/content/public/android/java/src/org/chromium/content/browser/NavigationEntry.java
index 6498e09..605c011 100644
--- a/content/public/android/java/src/org/chromium/content/browser/NavigationEntry.java
+++ b/content/public/android/java/src/org/chromium/content/browser/NavigationEntry.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/NavigationHistory.java b/content/public/android/java/src/org/chromium/content/browser/NavigationHistory.java
index ade3536..43f2074 100644
--- a/content/public/android/java/src/org/chromium/content/browser/NavigationHistory.java
+++ b/content/public/android/java/src/org/chromium/content/browser/NavigationHistory.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/PageInfo.java b/content/public/android/java/src/org/chromium/content/browser/PageInfo.java
index 6e81cb5..07e4352 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PageInfo.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PageInfo.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/PageTransitionTypes.template b/content/public/android/java/src/org/chromium/content/browser/PageTransitionTypes.template
index f9c96b9..97cfeab 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PageTransitionTypes.template
+++ b/content/public/android/java/src/org/chromium/content/browser/PageTransitionTypes.template
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java b/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java
index 19650d7..6d9271e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
index 5ba86ee..bdc5430 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PopupZoomer.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -459,8 +459,8 @@ class PopupZoomer extends View {
         // Since we want the content to appear directly above its counterpart on the
         // page, we need to remove the mShiftX/Y effect at the beginning of the animation.
         // The unshifting decreases with the animation.
-        float unshiftX = - mShiftX * (1.0f - fractionAnimation) / mScale;
-        float unshiftY = - mShiftY * (1.0f - fractionAnimation) / mScale;
+        float unshiftX = -mShiftX * (1.0f - fractionAnimation) / mScale;
+        float unshiftY = -mShiftY * (1.0f - fractionAnimation) / mScale;
 
         // Compute the rect to show.
         RectF rect = new RectF();
diff --git a/content/public/android/java/src/org/chromium/content/browser/RenderCoordinates.java b/content/public/android/java/src/org/chromium/content/browser/RenderCoordinates.java
index abb6ffc..98961c0 100644
--- a/content/public/android/java/src/org/chromium/content/browser/RenderCoordinates.java
+++ b/content/public/android/java/src/org/chromium/content/browser/RenderCoordinates.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
index acd2f63..23aacca 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -275,15 +275,12 @@ public class ResourceExtractor {
 
         try {
             mExtractTask.get();
-        }
-        catch (CancellationException e) {
+        } catch (CancellationException e) {
             // Don't leave the files in an inconsistent state.
             deleteFiles(mContext);
-        }
-        catch (ExecutionException e2) {
+        } catch (ExecutionException e2) {
             deleteFiles(mContext);
-        }
-        catch (InterruptedException e3) {
+        } catch (InterruptedException e3) {
             deleteFiles(mContext);
         }
     }
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java b/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
index 075a14c..c140cb6 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectActionModeCallback.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/SnapScrollController.java b/content/public/android/java/src/org/chromium/content/browser/SnapScrollController.java
index 25379e3..fd50a00 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SnapScrollController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SnapScrollController.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
index ec42902..7df3c65 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java
@@ -253,14 +253,14 @@ public class SpeechRecognition {
     }
 
     @CalledByNative
-    private void startRecognition(String language, boolean continuous, boolean interim_results) {
+    private void startRecognition(String language, boolean continuous, boolean interimResults) {
         if (mRecognizer == null)
             return;
 
         mContinuous = continuous;
         mIntent.putExtra("android.speech.extra.DICTATION_MODE", continuous);
         mIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, language);
-        mIntent.putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, interim_results);
+        mIntent.putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, interimResults);
         mRecognizer.startListening(mIntent);
     }
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/TouchPoint.java b/content/public/android/java/src/org/chromium/content/browser/TouchPoint.java
index 80c22ec..dc062ac 100644
--- a/content/public/android/java/src/org/chromium/content/browser/TouchPoint.java
+++ b/content/public/android/java/src/org/chromium/content/browser/TouchPoint.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/VSyncManager.java b/content/public/android/java/src/org/chromium/content/browser/VSyncManager.java
index 438d7c76..a152b41 100644
--- a/content/public/android/java/src/org/chromium/content/browser/VSyncManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/VSyncManager.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/VSyncMonitor.java b/content/public/android/java/src/org/chromium/content/browser/VSyncMonitor.java
index e685d22..7ad35d2 100644
--- a/content/public/android/java/src/org/chromium/content/browser/VSyncMonitor.java
+++ b/content/public/android/java/src/org/chromium/content/browser/VSyncMonitor.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
index 025428e..9578611 100644
--- a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
index c14d998..4e2faa8 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
index 732e90b..6887eb3 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
index ff02f1d..7abe51a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
@@ -320,8 +320,8 @@ public class BrowserAccessibilityManager {
     }
 
     @CalledByNative
-    private void addAccessibilityNodeInfoChild(AccessibilityNodeInfo node, int child_id) {
-        node.addChild(mView, child_id);
+    private void addAccessibilityNodeInfoChild(AccessibilityNodeInfo node, int childId) {
+        node.addChild(mView, childId);
     }
 
     @CalledByNative
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
index ac35478..172541f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanAccessibilityInjector.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/CursorController.java b/content/public/android/java/src/org/chromium/content/browser/input/CursorController.java
index 10e3064..68f88bc 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/CursorController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/CursorController.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
index 8cc41ff9..a8642ec 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -25,16 +25,16 @@ class DateTimeChooserAndroid {
         mInputDialogContainer = new InputDialogContainer(context,
                 new InputDialogContainer.InputActionDelegate() {
 
-            @Override
-            public void replaceDateTime(double value) {
-                nativeReplaceDateTime(mNativeDateTimeChooserAndroid, value);
-            }
+                    @Override
+                    public void replaceDateTime(double value) {
+                        nativeReplaceDateTime(mNativeDateTimeChooserAndroid, value);
+                    }
 
-            @Override
-            public void cancelDateTimeDialog() {
-                nativeCancelDialog(mNativeDateTimeChooserAndroid);
-            }
-        });
+                    @Override
+                    public void cancelDateTimeDialog() {
+                        nativeCancelDialog(mNativeDateTimeChooserAndroid);
+                    }
+                });
     }
 
     private void showDialog(int dialogType, double dialogValue,
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
index 8c3be1b..ea699f1 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimePickerDialog.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java
index 5416c31..e46b58e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestion.java
@@ -26,7 +26,7 @@ class DateTimeSuggestion {
     }
 
     double value() {
-      return mValue;
+        return mValue;
     }
 
     String localizedValue() {
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java
index 5ae7eb2..5a8d200 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeSuggestionListAdapter.java
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 package org.chromium.content.browser.input;
 
 import android.content.Context;
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/HandleView.java b/content/public/android/java/src/org/chromium/content/browser/input/HandleView.java
index 9c1919c..47a6327 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/HandleView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/HandleView.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/InputDialogContainer.java b/content/public/android/java/src/org/chromium/content/browser/input/InputDialogContainer.java
index af675f4..1a0881e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/InputDialogContainer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/InputDialogContainer.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -355,7 +355,6 @@ public class InputDialogContainer {
             return;
         mDialogAlreadyDismissed = true;
 
-        double value = 0;
         if (dialogType == sTextInputTypeMonth) {
             mInputActionDelegate.replaceDateTime((year - 1970) * 12 + month);
         } else if (dialogType == sTextInputTypeWeek) {
@@ -376,7 +375,7 @@ public class InputDialogContainer {
             cal.set(Calendar.MINUTE, minute);
             cal.set(Calendar.SECOND, second);
             cal.set(Calendar.MILLISECOND, millis);
-            mInputActionDelegate.replaceDateTime((double) cal.getTimeInMillis());
+            mInputActionDelegate.replaceDateTime(cal.getTimeInMillis());
         }
     }
 }
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java b/content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
index becc019..7dab7ce 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/InsertionHandleController.java b/content/public/android/java/src/org/chromium/content/browser/input/InsertionHandleController.java
index 44b5405..bd3a464 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/InsertionHandleController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/InsertionHandleController.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java b/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java
index c7ebe8d..593aa00 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/MonthPicker.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/MonthPickerDialog.java b/content/public/android/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
index e995b62..40f45b9 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/MonthPickerDialog.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
index 69d7a07..d5d8c9f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -58,11 +58,11 @@ public class SelectPopupDialog {
             });
             b.setNegativeButton(android.R.string.cancel,
                     new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    mContentViewCore.selectPopupMenuItems(null);
-                }
-            });
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            mContentViewCore.selectPopupMenuItems(null);
+                        }
+                    });
         }
         mListBoxPopup = b.create();
         final SelectPopupAdapter adapter = new SelectPopupAdapter(
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java b/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java
index d28286d..0edf551 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java b/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
index 0ff2bec..8730e81 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/TwoFieldDatePicker.java
@@ -71,7 +71,7 @@ public abstract class TwoFieldDatePicker extends FrameLayout {
                         year += 1;
                         positionInYear = getMinPositionInYear(year);
                     } else if (oldVal == picker.getMinValue() && newVal == picker.getMaxValue()) {
-                        year -=1;
+                        year -= 1;
                         positionInYear = getMaxPositionInYear(year);
                     }
                 } else if (picker == mYearSpinner) {
@@ -115,7 +115,7 @@ public abstract class TwoFieldDatePicker extends FrameLayout {
      *
      * @param year The initial year.
      * @param positionInYear The initial month <strong>starting from zero</strong> or week in year.
-     * @param onMonthChangedListener How user is notified date is changed by
+     * @param onMonthOrWeekChangedListener How user is notified date is changed by
      *            user, can be null.
      */
     public void init(int year, int positionInYear,
diff --git a/content/public/android/java/src/org/chromium/content/common/CleanupReference.java b/content/public/android/java/src/org/chromium/content/common/CleanupReference.java
index 89b6197f..484dcc4 100644
--- a/content/public/android/java/src/org/chromium/content/common/CleanupReference.java
+++ b/content/public/android/java/src/org/chromium/content/common/CleanupReference.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -41,7 +41,8 @@ public class CleanupReference extends WeakReference<Object> {
     private static ReferenceQueue<Object> sGcQueue = new ReferenceQueue<Object>();
     private static Object sCleanupMonitor = new Object();
 
-    static private final Thread sReaperThread = new Thread(TAG) {
+    private static final Thread sReaperThread = new Thread(TAG) {
+        @Override
         public void run() {
             while (true) {
                 try {
@@ -79,7 +80,7 @@ public class CleanupReference extends WeakReference<Object> {
      * set yet early in startup.
      */
     private static class LazyHolder {
-       static final Handler sHandler = new Handler(ThreadUtils.getUiThreadLooper()) {
+        static final Handler sHandler = new Handler(ThreadUtils.getUiThreadLooper()) {
             @Override
             public void handleMessage(Message msg) {
                 TraceEvent.begin();
diff --git a/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java b/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java
index ebaabd3..8216686 100644
--- a/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java
+++ b/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java
@@ -40,15 +40,15 @@ public abstract class ContentSwitches {
 
     // Whether to always expose web content using Android's accessibility
     // framework instead of injecting javascript for accessibility.
-    public static final String DISABLE_ACCESSIBILITY_SCRIPT_INJECTION
-            = "disable-accessibility-script-injection";
+    public static final String DISABLE_ACCESSIBILITY_SCRIPT_INJECTION =
+            "disable-accessibility-script-injection";
 
     // Sets the ISO country code that will be used for phone number detection.
     public static final String NETWORK_COUNTRY_ISO = "network-country-iso";
 
     // Whether to enable the auto-hiding top controls.
-    public static final String ENABLE_TOP_CONTROLS_POSITION_CALCULATION
-            = "enable-top-controls-position-calculation";
+    public static final String ENABLE_TOP_CONTROLS_POSITION_CALCULATION =
+            "enable-top-controls-position-calculation";
 
     // The height of the movable top controls.
     public static final String TOP_CONTROLS_HEIGHT = "top-controls-height";
@@ -76,4 +76,4 @@ public abstract class ContentSwitches {
 
     // Prevent instantiation.
     private ContentSwitches() {}
-};
+}
diff --git a/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java b/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
index 2c59e60..64a8fb4 100644
--- a/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
+++ b/content/public/android/java/src/org/chromium/content/common/DeviceTelephonyInfo.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -15,28 +15,29 @@ import org.chromium.base.CalledByNative;
  */
 public class DeviceTelephonyInfo {
 
-  private TelephonyManager mTelManager;
-
-  private DeviceTelephonyInfo(Context context) {
-      Context appContext = context.getApplicationContext();
-      mTelManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
-  }
-
-  /**
-   * @return The ISO country code equivalent of the current MCC.
-   */
-  @CalledByNative
-  public String getNetworkCountryIso() {
-      return mTelManager.getNetworkCountryIso();
-  }
-
-  /**
-   * Creates DeviceTelephonyInfo for a given Context.
-   * @param context A context to use.
-   * @return DeviceTelephonyInfo associated with a given Context.
-   */
-  @CalledByNative
-  public static DeviceTelephonyInfo create(Context context) {
-      return new DeviceTelephonyInfo(context);
-  }
+    private TelephonyManager mTelManager;
+
+    private DeviceTelephonyInfo(Context context) {
+        Context appContext = context.getApplicationContext();
+        mTelManager = (TelephonyManager) appContext.getSystemService(Context.TELEPHONY_SERVICE);
+    }
+
+    /**
+     * @return The ISO country code equivalent of the current MCC.
+     */
+    @CalledByNative
+    public String getNetworkCountryIso() {
+        return mTelManager.getNetworkCountryIso();
+    }
+
+    /**
+     * Creates DeviceTelephonyInfo for a given Context.
+     *
+     * @param context A context to use.
+     * @return DeviceTelephonyInfo associated with a given Context.
+     */
+    @CalledByNative
+    public static DeviceTelephonyInfo create(Context context) {
+        return new DeviceTelephonyInfo(context);
+    }
 }
diff --git a/content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl b/content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl
index 734c05e..f0c26d1 100644
--- a/content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl
+++ b/content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl b/content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl
index 0b6c09a..1c455da 100644
--- a/content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl
+++ b/content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/PerfTraceEvent.java b/content/public/android/java/src/org/chromium/content/common/PerfTraceEvent.java
index 6516efa..b86fadc 100644
--- a/content/public/android/java/src/org/chromium/content/common/PerfTraceEvent.java
+++ b/content/public/android/java/src/org/chromium/content/common/PerfTraceEvent.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/ProcessInitException.java b/content/public/android/java/src/org/chromium/content/common/ProcessInitException.java
index cd6d54e..0ebbb17 100644
--- a/content/public/android/java/src/org/chromium/content/common/ProcessInitException.java
+++ b/content/public/android/java/src/org/chromium/content/common/ProcessInitException.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/ResultCodes.template b/content/public/android/java/src/org/chromium/content/common/ResultCodes.template
index 69962bf..5670b92 100644
--- a/content/public/android/java/src/org/chromium/content/common/ResultCodes.template
+++ b/content/public/android/java/src/org/chromium/content/common/ResultCodes.template
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/TopControlsState.template b/content/public/android/java/src/org/chromium/content/common/TopControlsState.template
index 97a3f17..65e0414 100644
--- a/content/public/android/java/src/org/chromium/content/common/TopControlsState.template
+++ b/content/public/android/java/src/org/chromium/content/common/TopControlsState.template
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/java/src/org/chromium/content/common/TraceEvent.java b/content/public/android/java/src/org/chromium/content/common/TraceEvent.java
index ff69ec1..2b1dac0 100644
--- a/content/public/android/java/src/org/chromium/content/common/TraceEvent.java
+++ b/content/public/android/java/src/org/chromium/content/common/TraceEvent.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -17,19 +17,19 @@ import org.chromium.base.ThreadUtils;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-// Java mirror of Chrome trace event API.  See
-// base/debug/trace_event.h.  Unlike the native version, Java does not
-// have stack objects, so a TRACE_EVENT() which does both
-// TRACE_EVENT_BEGIN() and TRACE_EVENT_END() in ctor/dtor is not
-// possible.
-// It is OK to use tracing before the native library has loaded, but such traces will
-// be ignored. (Perhaps we could devise to buffer them up in future?).
+/**
+ * Java mirror of Chrome trace event API. See base/debug/trace_event.h.  Unlike the native version,
+ * Java does not have stack objects, so a TRACE_EVENT() which does both TRACE_EVENT_BEGIN() and
+ * TRACE_EVENT_END() in ctor/dtor is not possible.
+ * It is OK to use tracing before the native library has loaded, but such traces will
+ * be ignored. (Perhaps we could devise to buffer them up in future?).
+ */
 public class TraceEvent {
 
     private static volatile boolean sEnabled = false;
 
     private static class BasicLooperMonitor implements Printer {
-        private final static String DISPATCH_EVENT_NAME =
+        private static final String DISPATCH_EVENT_NAME =
                 "Looper.dispatchMessage";
 
         @Override
@@ -72,19 +72,19 @@ public class TraceEvent {
      * accumulate between idle notifications and get reset when a new idle
      * notification is received.
      */
-    private final static class IdleTracingLooperMonitor extends BasicLooperMonitor
+    private static final class IdleTracingLooperMonitor extends BasicLooperMonitor
             implements MessageQueue.IdleHandler {
         // Tags for dumping to logcat or TraceEvent
-        private final static String TAG = "TraceEvent.LooperMonitor";
-        private final static String IDLE_EVENT_NAME = "Looper.queueIdle";
+        private static final String TAG = "TraceEvent.LooperMonitor";
+        private static final String IDLE_EVENT_NAME = "Looper.queueIdle";
 
         // Calculation constants
-        private final static long FRAME_DURATION_MILLIS = 1000L / 60L; // 60 FPS
+        private static final long FRAME_DURATION_MILLIS = 1000L / 60L; // 60 FPS
         // A reasonable threshold for defining a Looper event as "long running"
-        private final static long MIN_INTERESTING_DURATION_MILLIS =
+        private static final long MIN_INTERESTING_DURATION_MILLIS =
                 FRAME_DURATION_MILLIS;
         // A reasonable threshold for a "burst" of tasks on the Looper
-        private final static long MIN_INTERESTING_BURST_DURATION_MILLIS =
+        private static final long MIN_INTERESTING_BURST_DURATION_MILLIS =
                 MIN_INTERESTING_DURATION_MILLIS * 3;
 
         // Stats tracking
@@ -166,8 +166,8 @@ public class TraceEvent {
     }
 
     // Holder for monitor avoids unnecessary construction on non-debug runs
-    private final static class LooperMonitorHolder {
-        private final static BasicLooperMonitor sInstance =
+    private static final class LooperMonitorHolder {
+        private static final BasicLooperMonitor sInstance =
                 CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_IDLE_TRACING) ?
                         new IdleTracingLooperMonitor() : new BasicLooperMonitor();
     }
diff --git a/content/public/android/java/src/org/chromium/content/common/common.aidl b/content/public/android/java/src/org/chromium/content/common/common.aidl
index 565ae3a..58260f4 100644
--- a/content/public/android/java/src/org/chromium/content/common/common.aidl
+++ b/content/public/android/java/src/org/chromium/content/common/common.aidl
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
index ce7cfd6..3b6bc80 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
index 0eb5a27..2f8f9c0 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
index 0180ddd..7ae754c 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
index c0ef048..3035e97 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -164,7 +164,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
         }
     }
 
-    static private MotionEvent motionEvent(int action, long downTime, long eventTime) {
+    private static MotionEvent motionEvent(int action, long downTime, long eventTime) {
         return MotionEvent.obtain(downTime, eventTime, action, FAKE_COORD_X, FAKE_COORD_Y, 0);
     }
 
@@ -595,7 +595,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
                         ContentViewGestureHandler.GESTURE_SCROLL_END));
         assertEquals("We should have stopped scrolling",
                 ContentViewGestureHandler.GESTURE_SCROLL_END,
-                (int) mockDelegate.mMostRecentGestureEvent.mType);
+                mockDelegate.mMostRecentGestureEvent.mType);
         assertEquals("Only tapDown, scrollBegin and scrollBy and scrollEnd should have been sent",
                 5, mockDelegate.mGestureTypeList.size());
     }
@@ -1132,7 +1132,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
             public Bundle getExtraParams() {
                 return mExtraParams;
             }
-        };
+        }
         private GestureEvent mMostRecentGestureEvent;
         private final ArrayList<Integer> mGestureTypeList = new ArrayList<Integer>();
         private final ArrayList<Long> mGestureTimeList = new ArrayList<Long>();
@@ -1145,7 +1145,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
 
         @Override
         public boolean sendGesture(int type, long timeMs, int x, int y, Bundle extraParams) {
-            Log.i(TAG,"Gesture event received with type id " + type);
+            Log.i(TAG, "Gesture event received with type id " + type);
             mMostRecentGestureEvent = new GestureEvent(type, timeMs, x, y, extraParams);
             mGestureTypeList.add(mMostRecentGestureEvent.mType);
             mGestureTimeList.add(timeMs);
@@ -1425,7 +1425,8 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
      */
     @SmallTest
     @Feature({"Gestures"})
-    public void testTouchMoveWithinTouchSlopNotDeferredIfJavascriptConsumingGesture() throws Exception {
+    public void testTouchMoveWithinTouchSlopNotDeferredIfJavascriptConsumingGesture()
+            throws Exception {
         Context context = getInstrumentation().getTargetContext();
         final long downTime = SystemClock.uptimeMillis();
         final long eventTime = SystemClock.uptimeMillis();
@@ -1771,7 +1772,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
                 FAKE_COORD_X * 5, FAKE_COORD_Y * 5, 0);
         assertTrue(mGestureHandler.onTouchEvent(event));
         assertEquals(0, mGestureHandler.getNumberOfPendingMotionEventsForTesting());
-   }
+    }
 
     /**
      * Verify that no double tap gestures are created if the gesture handler is
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
index 36f6b3b..6205d3b 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
index d52a7e6..92d3a3d 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
index dbce926..fb34e84 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
index bcdc7aa..5d3d9e3 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/DeviceMotionAndOrientationTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -154,8 +154,8 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
         assertTrue(startOrientation);
         assertTrue(mDeviceMotionAndOrientation.mDeviceOrientationIsActive);
 
-        float alpha = (float)Math.PI / 4;
-        float[] values = {0, 0, (float)Math.sin(alpha / 2), (float)Math.cos(alpha / 2), -1};
+        float alpha = (float) Math.PI / 4;
+        float[] values = {0, 0, (float) Math.sin(alpha / 2), (float) Math.cos(alpha / 2), -1};
         mDeviceMotionAndOrientation.sensorChanged(Sensor.TYPE_ROTATION_VECTOR, values);
         mDeviceMotionAndOrientation.verifyCalls("gotOrientation");
         mDeviceMotionAndOrientation.verifyValuesEpsilon(Math.toDegrees(alpha), 0, 0);
@@ -203,8 +203,8 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
         assertTrue(mDeviceMotionAndOrientation.mDeviceMotionIsActive);
         assertTrue(mDeviceMotionAndOrientation.mDeviceOrientationIsActive);
 
-        float alpha = (float)Math.PI / 4;
-        float[] values = {0, 0, (float)Math.sin(alpha / 2), (float)Math.cos(alpha / 2), -1};
+        float alpha = (float) Math.PI / 4;
+        float[] values = {0, 0, (float) Math.sin(alpha / 2), (float) Math.cos(alpha / 2), -1};
         mDeviceMotionAndOrientation.sensorChanged(Sensor.TYPE_ROTATION_VECTOR, values);
         mDeviceMotionAndOrientation.verifyCalls("gotOrientation");
         mDeviceMotionAndOrientation.verifyValuesEpsilon(Math.toDegrees(alpha), 0, 0);
@@ -230,7 +230,7 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
 
     @SmallTest
     public void testOrientationAnglesFromRotationMatrix45DegreesX() {
-        float[] gravity = {0, (float)Math.sin(Math.PI / 4), (float)Math.cos(Math.PI / 4)};
+        float[] gravity = {0, (float) Math.sin(Math.PI / 4), (float) Math.cos(Math.PI / 4)};
         float[] magnetic = {0, 1, 0};
         double[] expectedAngles = {0, Math.PI / 4, 0};
 
@@ -239,7 +239,7 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
 
     @SmallTest
     public void testOrientationAnglesFromRotationMatrix45DegreesY() {
-        float[] gravity = {-(float)Math.sin(Math.PI / 4), 0, (float)Math.cos(Math.PI / 4)};
+        float[] gravity = {-(float) Math.sin(Math.PI / 4), 0, (float) Math.cos(Math.PI / 4)};
         float[] magnetic = {0, 1, 0};
         double[] expectedAngles = {0, 0, Math.PI / 4};
 
@@ -249,7 +249,7 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
     @SmallTest
     public void testOrientationAnglesFromRotationMatrix45DegreesZ() {
         float[] gravity = {0, 0, 1};
-        float[] magnetic = {(float)Math.sin(Math.PI / 4), (float)Math.cos(Math.PI / 4), 0};
+        float[] magnetic = {(float) Math.sin(Math.PI / 4), (float) Math.cos(Math.PI / 4), 0};
         double[] expectedAngles = {Math.PI / 4, 0, 0};
 
         verifyOrientationAngles(gravity, magnetic, expectedAngles);
@@ -258,7 +258,7 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
     @SmallTest
     public void testOrientationAnglesFromRotationMatrixGimbalLock() {
         float[] gravity = {0, 1, 0};
-        float[] magnetic = {(float)Math.sin(Math.PI / 4), 0, -(float)Math.cos(Math.PI / 4)};
+        float[] magnetic = {(float) Math.sin(Math.PI / 4), 0, -(float) Math.cos(Math.PI / 4)};
         double[] expectedAngles = {Math.PI / 4, Math.PI / 2, 0};  // favor yaw instead of roll
 
         verifyOrientationAngles(gravity, magnetic, expectedAngles);
@@ -267,8 +267,8 @@ public class DeviceMotionAndOrientationTest extends AndroidTestCase {
     @SmallTest
     public void testOrientationAnglesFromRotationMatrixPitchGreaterThan90() {
         final double largePitchAngle = Math.PI / 2 + Math.PI / 4;
-        float[] gravity = {0, (float)Math.cos(largePitchAngle - Math.PI / 2),
-                -(float)Math.sin(largePitchAngle - Math.PI / 2)};
+        float[] gravity = {0, (float) Math.cos(largePitchAngle - Math.PI / 2),
+                -(float) Math.sin(largePitchAngle - Math.PI / 2)};
         float[] magnetic = {0, 0, -1};
         double[] expectedAngles = {0, largePitchAngle, 0};
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
index 2bd8797..0ee13df 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java b/content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java
index 3a849d4..1f10ac9 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
index 27db21d..8aa783d 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
index 77a154b..31be5e9 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -51,7 +51,7 @@ public class ImportantFileWriterAndroidTest extends InstrumentationTestCase {
             dis.readFully(fileData);
             dis.close();
             assertEquals("Data length wrong", data.length, fileData.length);
-            for(int i = 0; i < data.length; i++) {
+            for (int i = 0; i < data.length; i++) {
                 assertEquals("Data byte wrong", data[i], fileData[i]);
             }
         } catch (IOException e) {
@@ -72,7 +72,7 @@ public class ImportantFileWriterAndroidTest extends InstrumentationTestCase {
         File testFile = new File(dir, "ImportantFileTest");
 
         // Make sure the file doesn't already exist
-        if(testFile.exists()) {
+        if (testFile.exists()) {
             assertTrue(testFile.delete());
         }
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java b/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
index fd9de2e..a337d6f 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
index ce7a2ef..4400625 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
index 1067a28..5ccc309 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
index f5cd83e..4cd1008 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
@@ -1,4 +1,4 @@
-// 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.
 
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 599a753..b8b098c 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
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
index dea76d1..3afe250 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeCoercionTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
index f8322f0..0590608 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeFieldsTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
index 8afcb3a..dfe83ea 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeReturnValuesTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
index 83a0d83..846512e 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
index 5173fb2..aeba7bb 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
index 9fd2ca1..a89a285 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
index e5b170a..67ec23a 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
index 249317e..401819a 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
index 29eeccd..946a0c1 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java b/content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
index 2e7b795..e58f3ac 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -37,8 +37,8 @@ public class TestsJavaScriptEvalTest extends ContentShellTestBase {
         final TestCallbackHelperContainer viewClient =
                 new TestCallbackHelperContainer(view);
 
-        for(int i = 0; i < 30; ++i) {
-            for(int j = 0; j < 10; ++j) {
+        for (int i = 0; i < 30; ++i) {
+            for (int j = 0; j < 10; ++j) {
                 // Start evaluation of a JavaScript script -- we don't need a result.
                 view.evaluateJavaScript("foobar();");
             }
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java b/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
index 89a431d..a0274aa 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
index f576477..f44a939 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
index 91e6124..7c35962 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/InsertionHandleTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
index 923162b..f4c1870 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
index 69f09c7..5f6deb4 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java
@@ -66,7 +66,7 @@ class NestedSystemMessageHandler {
         while (!quitLoop) {
             Message msg = null;
             try {
-                msg = (Message)nextMethod.invoke(queue);
+                msg = (Message) nextMethod.invoke(queue);
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
                 return false;
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
index 95e4b62..3609d08 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -141,7 +141,7 @@ public class CallbackHelper {
      * is called.
      */
     public int getCallCount() {
-        synchronized(mLock) {
+        synchronized (mLock) {
             return mCallCount;
         }
     }
@@ -170,7 +170,7 @@ public class CallbackHelper {
             TimeUnit unit) throws InterruptedException, TimeoutException {
         assert mCallCount >= currentCallCount;
         assert numberOfCallsToWaitFor > 0;
-        synchronized(mLock) {
+        synchronized (mLock) {
             int callCountWhenDoneWaiting = currentCallCount + numberOfCallsToWaitFor;
             while (callCountWhenDoneWaiting > mCallCount) {
                 int callCountBeforeWait = mCallCount;
@@ -201,7 +201,7 @@ public class CallbackHelper {
      */
     public void waitUntilCriteria(Criteria criteria, long timeout, TimeUnit unit)
             throws InterruptedException, TimeoutException {
-        synchronized(mLock) {
+        synchronized (mLock) {
             final long startTime = System.currentTimeMillis();
             boolean isSatisfied = criteria.isSatisfied();
             while (!isSatisfied &&
@@ -222,7 +222,7 @@ public class CallbackHelper {
      * Should be called when the callback associated with this helper object is called.
      */
     public void notifyCalled() {
-        synchronized(mLock) {
+        synchronized (mLock) {
             mCallCount++;
             mLock.notifyAll();
         }
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/Criteria.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/Criteria.java
index 32d392d..b7349aa 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/Criteria.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/Criteria.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
index 9bb7a78..92b59d2 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
index 8330152..f9a63f8 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -139,7 +139,7 @@ public class DOMUtils {
         sb.append("(function() {");
         sb.append("  var node = document.getElementById('" + nodeId + "');");
         sb.append("  if (!node) return null;");
-        sb.append("  if (!node." + fieldName +") return null;");
+        sb.append("  if (!node." + fieldName + ") return null;");
         sb.append("  return [ node." + fieldName + " ];");
         sb.append("})();");
 
@@ -173,9 +173,9 @@ public class DOMUtils {
         Assert.assertNotNull("Failed to get DOM element bounds of '" + nodeName + "'.", bounds);
 
         int clickX = (int) view.getRenderCoordinates().fromLocalCssToPix(bounds.exactCenterX())
-                + (int) view.getContentViewCore().getViewportSizeOffsetWidthPix();
+                + view.getContentViewCore().getViewportSizeOffsetWidthPix();
         int clickY = (int) view.getRenderCoordinates().fromLocalCssToPix(bounds.exactCenterY())
-                + (int) view.getContentViewCore().getViewportSizeOffsetHeightPix();
+                + view.getContentViewCore().getViewportSizeOffsetHeightPix();
         return new int[] { clickX, clickY };
     }
 }
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
index db557e3..54474b6 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class HistoryUtils {
 
-    protected final static int WAIT_TIMEOUT_SECONDS = 15;
+    protected static final int WAIT_TIMEOUT_SECONDS = 15;
 
     /**
      * Calls {@link ContentView#canGoBack()} on UI thread.
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
index 157265c..a08bc7a 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
index 8798b79..0abbe97 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/KeyUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
index 016e98c..c0b1554 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
index 2b72307..e014193 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClient.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
index 9cc33cf..760192d 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewClientWrapper.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
index 0cf2b56..134aab3 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestTouchUtils.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 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.
 
@@ -88,7 +88,7 @@ public class TestTouchUtils extends android.test.TouchUtils {
      * @param instrumentation Instrumentation object used by the test.
      */
     public static void sleepForDoubleTapTimeout(Instrumentation instrumentation) {
-        SystemClock.sleep((long)(ViewConfiguration.getDoubleTapTimeout() * 1.5));
+        SystemClock.sleep((long) (ViewConfiguration.getDoubleTapTimeout() * 1.5));
     }
 
     /**
@@ -106,7 +106,7 @@ public class TestTouchUtils extends android.test.TouchUtils {
 
         long downTime = SystemClock.uptimeMillis();
         sendAction(instrumentation, MotionEvent.ACTION_DOWN, downTime, absoluteX, absoluteY);
-        SystemClock.sleep((long)(ViewConfiguration.getLongPressTimeout() * 1.5));
+        SystemClock.sleep((long) (ViewConfiguration.getLongPressTimeout() * 1.5));
         sendAction(instrumentation, MotionEvent.ACTION_UP, downTime, absoluteX, absoluteY);
     }
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
index 76fc3c4..1e25a92 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestWebContentsObserver.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
index 7c54b7c..f8d2e13 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TouchCommon.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -214,7 +214,7 @@ public class TouchCommon {
                     view.dispatchTouchEvent(event);
                 }
             });
-        } catch(Throwable e) {
+        } catch (Throwable e) {
             throw new RuntimeException("Dispatching touch event failed", e);
         }
     }
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
index 7c51542..cba9187 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -31,7 +31,8 @@ public class UiUtils {
             public void run() {
                 runnable.run();
                 finishedSemaphore.release();
-            }});
+            }
+        });
         try {
             Assert.assertTrue(finishedSemaphore.tryAcquire(1, WAIT_FOR_RESPONSE_MS,
                     TimeUnit.MILLISECONDS));
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
index bab7240..be36d6e 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
index 11ccac6..22a70e0 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
index 55a07c8..1ec5919 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
index c112ede..aad1197 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java
index 489f781..0fa41b6 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
index 0ce8a7f..3c0ebb4 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java
index 8f773ca..4eb55b8 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index 4166623..e055d7b 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -1,4 +1,4 @@
-// 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.
 
@@ -83,8 +83,7 @@ public class ContentShellActivity extends Activity {
             try {
                 BrowserStartupController.get(this).startBrowserProcessesSync(
                        BrowserStartupController.MAX_RENDERERS_LIMIT);
-            }
-            catch (ProcessInitException e) {
+            } catch (ProcessInitException e) {
                 Log.e(TAG, "Failed to load native library.", e);
                 System.exit(-1);
             }
@@ -92,21 +91,20 @@ public class ContentShellActivity extends Activity {
             try {
                 BrowserStartupController.get(this).startBrowserProcessesAsync(
                         new BrowserStartupController.StartupCallback() {
-                    @Override
-                    public void onSuccess(boolean alreadyStarted) {
-                        finishInitialization(savedInstanceState);
-                    }
-
-                    @Override
-                    public void onFailure() {
-                        initializationFailed();
-                    }
-                });
-            }
-            catch (ProcessInitException e) {
+                            @Override
+                            public void onSuccess(boolean alreadyStarted) {
+                                finishInitialization(savedInstanceState);
+                            }
+
+                            @Override
+                            public void onFailure() {
+                                initializationFailed();
+                            }
+                        });
+            } catch (ProcessInitException e) {
                 Log.e(TAG, "Unable to load native library.", e);
                 System.exit(-1);
-          }
+            }
         }
     }
 
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
index 3e17207..43ded48 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
@@ -1,4 +1,4 @@
-// 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.