Refactor ShortcutHelper and merge in BookmarkUtils

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarksUriTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarksUriTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarksUriTest.java
index 26de3ac9947ab501cdcd689d3fdab696f6873a08..7e25c8278e578e0c9cb6aaa40ecde304e45fa285 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarksUriTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarksUriTest.java
@@ -10,7 +10,7 @@ import android.net.Uri;
 
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.chrome.browser.ChromeBrowserProvider;
-import org.chromium.chrome.test.util.browser.BookmarkUtils;
+import org.chromium.chrome.test.util.browser.ShortcutHelper;
 
 import java.util.Date;
 
@@ -65,7 +65,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         values.put(BookmarkColumns.BOOKMARK, 0);
         values.put(BookmarkColumns.DATE, lastUpdateTime);
         values.put(BookmarkColumns.CREATED, createdTime);
-        values.put(BookmarkColumns.FAVICON, BookmarkUtils.getIcon(ICON_PATH));
+        values.put(BookmarkColumns.FAVICON, ShortcutHelper.getIcon(ICON_PATH));
         values.put(BookmarkColumns.URL, url);
         values.put(BookmarkColumns.VISITS, visits);
         values.put(BookmarkColumns.TITLE, title);
@@ -84,7 +84,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         assertEquals(lastUpdateTime, cursor.getLong(index));
         index = cursor.getColumnIndex(BookmarkColumns.FAVICON);
         assertTrue(-1 != index);
-        assertTrue(BookmarkUtils.byteArrayEqual(BookmarkUtils.getIcon(ICON_PATH),
+        assertTrue(ShortcutHelper.byteArrayEqual(ShortcutHelper.getIcon(ICON_PATH),
                 cursor.getBlob(index)));
         index = cursor.getColumnIndex(BookmarkColumns.URL);
         assertTrue(-1 != index);
@@ -109,7 +109,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         final String title[] = { "Google", "Mail" };
         final int isBookmark[] = { 1, 0 };
         Uri[] uris = new Uri[2];
-        byte[][] icons = { BookmarkUtils.getIcon(ICON_PATH), null };
+        byte[][] icons = { ShortcutHelper.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]);
@@ -136,7 +136,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         assertEquals(lastUpdateTime[0], cursor.getLong(index));
         index = cursor.getColumnIndex(BookmarkColumns.FAVICON);
         assertTrue(-1 != index);
-        assertTrue(BookmarkUtils.byteArrayEqual(icons[0], cursor.getBlob(index)));
+        assertTrue(ShortcutHelper.byteArrayEqual(icons[0], cursor.getBlob(index)));
         index = cursor.getColumnIndex(BookmarkColumns.URL);
         assertTrue(-1 != index);
         assertEquals(url[0], cursor.getString(index));
@@ -164,7 +164,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         assertEquals(lastUpdateTime[1], cursor.getLong(index));
         index = cursor.getColumnIndex(BookmarkColumns.FAVICON);
         assertTrue(-1 != index);
-        assertTrue(BookmarkUtils.byteArrayEqual(icons[1], cursor.getBlob(index)));
+        assertTrue(ShortcutHelper.byteArrayEqual(icons[1], cursor.getBlob(index)));
         index = cursor.getColumnIndex(BookmarkColumns.URL);
         assertTrue(-1 != index);
         assertEquals(url[1], cursor.getString(index));
@@ -188,7 +188,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         final String title[] = { "Google", "Mail" };
         final int isBookmark[] = { 1, 0 };
 
-        byte[][] icons = { BookmarkUtils.getIcon(ICON_PATH), null };
+        byte[][] icons = { ShortcutHelper.getIcon(ICON_PATH), null };
         Uri uri = addBookmark(url[0], title[0], lastUpdateTime[0], createdTime[0], visits[0],
                 icons[0], isBookmark[0]);
         assertNotNull(uri);
@@ -219,7 +219,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         assertEquals(lastUpdateTime[1], cursor.getLong(index));
         index = cursor.getColumnIndex(BookmarkColumns.FAVICON);
         assertTrue(-1 != index);
-        assertTrue(BookmarkUtils.byteArrayEqual(icons[1], cursor.getBlob(index)));
+        assertTrue(ShortcutHelper.byteArrayEqual(icons[1], cursor.getBlob(index)));
         index = cursor.getColumnIndex(BookmarkColumns.URL);
         assertTrue(-1 != index);
         assertEquals(url[1], cursor.getString(index));
@@ -243,7 +243,7 @@ public class ProviderBookmarksUriTest extends ProviderTestBase {
         final String title[] = { "Google", "Mail" };
         final int isBookmark[] = { 1, 0 };
         Uri[] uris = new Uri[2];
-        byte[][] icons = { BookmarkUtils.getIcon(ICON_PATH), null };
+        byte[][] icons = { ShortcutHelper.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]);