Refactor ShortcutHelper and merge in BookmarkUtils

chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ProviderBookmarkNodeUnitTest.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.bookmark;
 
 import android.os.Parcel;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeBrowserProvider.BookmarkNode;
 import org.chromium.chrome.browser.ChromeBrowserProvider.Type;
-import org.chromium.chrome.test.util.browser.BookmarkUtils;
+import org.chromium.chrome.test.util.browser.ShortcutHelper;
 
 import java.util.Random;
 
 /**
  * Tests parceling of bookmark node hierarchies used by the provider client API.
  */
 public class ProviderBookmarkNodeUnitTest extends AndroidTestCase {
     Random mGenerator = new Random();
     byte[][] mImageBlobs = null;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         mImageBlobs = new byte[][] {
-            BookmarkUtils.getIcon("chrome/provider/icon1.png"),
-            BookmarkUtils.getIcon("chrome/provider/icon2.png"),
-            BookmarkUtils.getIcon("chrome/provider/icon3.png"),
+            ShortcutHelper.getIcon("chrome/provider/icon1.png"),
+            ShortcutHelper.getIcon("chrome/provider/icon2.png"),
+            ShortcutHelper.getIcon("chrome/provider/icon3.png"),
         };
 
         for (byte[] icon : mImageBlobs) {
             assertNotNull(icon);
         }
     }
 
     private static BookmarkNode parcelNode(BookmarkNode node) {
         Parcel output = Parcel.obtain();
         Parcel input = Parcel.obtain();
@@ skipping 116 matching lines @@
 
     @SmallTest
     @Feature({"Android-ContentProvider"})
     public void testInvalidHierarchy() throws InterruptedException {
         BookmarkNode root = new BookmarkNode(1, Type.FOLDER, "Bookmarks", null, null);
         root.addChild(new BookmarkNode(2, Type.URL, "Google", "http://www.google.com/", root));
         root.addChild(new BookmarkNode(2, Type.URL, "GoogleMaps", "http://maps.google.com/", root));
         assertFalse(internalTestNodeHierarchyParceling(root));
     }
 }