Fix Java style issues in base/

BUG=320711
NOTRY=true

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

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

13 files changed, 18 insertions, 18 deletions

diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java b/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java
index a57a8b0..fe3db42 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/AdvancedMockContext.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.
 
@@ -24,7 +24,7 @@ public class AdvancedMockContext extends ContextWrapper {
     private final Map<String, SharedPreferences> mSharedPreferences =
             new HashMap<String, SharedPreferences>();
 
-    private final Map<String, Boolean> flags = new HashMap<String, Boolean>();
+    private final Map<String, Boolean> mFlags = new HashMap<String, Boolean>();
 
     public AdvancedMockContext(Context base) {
         super(base);
@@ -71,15 +71,15 @@ public class AdvancedMockContext extends ContextWrapper {
     }
 
     public void setFlag(String key) {
-        flags.put(key, true);
+        mFlags.put(key, true);
     }
 
     public void clearFlag(String key) {
-        flags.remove(key);
+        mFlags.remove(key);
     }
 
     public boolean isFlagSet(String key) {
-        return flags.containsKey(key) && flags.get(key);
+        return mFlags.containsKey(key) && mFlags.get(key);
     }
 
     public static class MapBuilder {
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
index c2b2ecd..0dfb4be8 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.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/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java
index 9f8fa93..af483ec 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/EnormousTest.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/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java b/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java
index aa120ea..1bc9226 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/Feature.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/base/test/android/javatests/src/org/chromium/base/test/util/HostDrivenTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/HostDrivenTest.java
index 11886ac..b52fb2c 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/HostDrivenTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/HostDrivenTest.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/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java b/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java
index c127732..2587d72 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/InMemorySharedPreferences.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/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java
index 0dc730a..20cfd9d 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.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/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java b/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java
index b088725..11026ef 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/Restriction.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/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java b/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
index a107b32..0bea8d8 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.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/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java
index 1afbc11..a64b72f 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.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/base/test/android/javatests/src/org/chromium/base/test/util/TestThread.java b/base/test/android/javatests/src/org/chromium/base/test/util/TestThread.java
index 11e6afd..93c23f7 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/TestThread.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TestThread.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/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
index a3b0641..5aee05e 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.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/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
index 8ef0ac5..d011593 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.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.
 
@@ -12,7 +12,7 @@ import junit.framework.Assert;
  * Collection of URL utilities.
  */
 public class UrlUtils {
-    private final static String DATA_DIR = "/chrome/test/data/";
+    private static final String DATA_DIR = "/chrome/test/data/";
 
     /**
      * Construct the full path of a test data file.