Enable NeedsBraces check and fix some checkstyle issues.

chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderBookmarksUriTest.java

 // 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.chrome.browser.test;
 
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Browser.BookmarkColumns;
@@ skipping 185 matching lines @@
 
         ContentValues values = new ContentValues();
         values.put(BookmarkColumns.BOOKMARK, isBookmark[1]);
         values.put(BookmarkColumns.DATE, lastUpdateTime[1]);
         values.put(BookmarkColumns.URL, url[1]);
         values.putNull(BookmarkColumns.FAVICON);
         values.put(BookmarkColumns.TITLE, title[1]);
         values.put(BookmarkColumns.VISITS, visits[1]);
         String[] selectionArgs = { String.valueOf(lastUpdateTime[0]),
                 String.valueOf(isBookmark[0]) };
-        getContentResolver().update(uri, values, BookmarkColumns.FAVICON +  " IS NOT NULL AND " +
-                BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
+        getContentResolver().update(uri, values, BookmarkColumns.FAVICON +  " IS NOT NULL AND "
+                + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
                 selectionArgs);
         Cursor cursor = getContentResolver().query(uri, null, null, null, null);
         assertEquals(1, cursor.getCount());
         assertTrue(cursor.moveToNext());
         int index = cursor.getColumnIndex(BookmarkColumns.BOOKMARK);
         assertTrue(-1 != index);
         assertEquals(isBookmark[1], cursor.getInt(index));
         index = cursor.getColumnIndex(BookmarkColumns.CREATED);
         assertTrue(-1 != index);
         assertEquals(createdTime[0], cursor.getLong(index));
@@ skipping 28 matching lines @@
         Uri[] uris = new Uri[2];
         byte[][] icons = { BookmarkUtils.getIcon(ICON_PATH), null };
         for (int i = 0; i < uris.length; i++) {
             uris[i] = addBookmark(url[i], title[i], lastUpdateTime[i], createdTime[i], visits[i],
                     icons[i], isBookmark[i]);
             assertNotNull(uris[i]);
         }
 
         String[] selectionArgs = { String.valueOf(lastUpdateTime[0]),
                 String.valueOf(isBookmark[0]) };
-        getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON +  " IS NOT NULL AND " +
-                BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
+        getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON +  " IS NOT NULL AND "
+                + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
                 selectionArgs);
         Cursor cursor = getContentResolver().query(uris[0], null, null, null, null);
         assertNotNull(cursor);
         assertEquals(0, cursor.getCount());
         cursor = getContentResolver().query(uris[1], null, null, null, null);
         assertNotNull(cursor);
         assertEquals(1, cursor.getCount());
         String[] selectionArgs1 = { String.valueOf(lastUpdateTime[1]),
                 String.valueOf(isBookmark[1]) };
-        getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON +  " IS NULL AND " +
-                BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
+        getContentResolver().delete(mBookmarksUri, BookmarkColumns.FAVICON +  " IS NULL AND "
+                + BookmarkColumns.DATE + "= ? AND " + BookmarkColumns.BOOKMARK + " = ?",
                 selectionArgs1);
         cursor = getContentResolver().query(uris[1], null, null, null, null);
         assertNotNull(cursor);
         assertEquals(0, cursor.getCount());
     }
 
     /*
      * Copied from CTS test with minor adaptations.
      */
     /**
@@ skipping 83 matching lines @@
         // Test: delete.
         getContentResolver().delete(insertUri, null, null);
         cursor = getContentResolver().query(
                 mBookmarksUri,
                 bookmarksProjection,
                 BookmarkColumns._ID + " = " + Id,
                 null, null);
         assertEquals(0, cursor.getCount());
     }
 }