Revert of [Andorid] Migrate to ClipDrawable progress bar.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
index 2d21c698e7edc696849052ffc828faa54387c241..d1500bcdf19252cb253d4bf786d4241d7a50a5e5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
@@ -26,8 +26,8 @@
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.util.ViewUtils;
+import org.chromium.chrome.browser.widget.SmoothProgressBar;
 import org.chromium.chrome.browser.widget.TintedImageButton;
-import org.chromium.chrome.browser.widget.ToolbarProgressBar;
 import org.chromium.ui.UiUtils;
 
 /**
@@ -50,7 +50,7 @@
 
     private ToolbarDataProvider mToolbarDataProvider;
     private ToolbarTabController mToolbarTabController;
-    private ToolbarProgressBar mProgressBar;
+    private SmoothProgressBar mProgressBar;
 
     private boolean mNativeLibraryReady;
     private boolean mUrlHasFocus;
@@ -74,11 +74,12 @@
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = (ToolbarProgressBar) findViewById(R.id.progress);
+        mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
         if (mProgressBar != null) {
             removeView(mProgressBar);
+            Drawable progressDrawable = mProgressBar.getProgressDrawable();
             getFrameLayoutParams(mProgressBar).topMargin = mToolbarHeightWithoutShadow
-                    - getFrameLayoutParams(mProgressBar).height;
+                    - progressDrawable.getIntrinsicHeight();
         }
 
         mMenuButton = (TintedImageButton) findViewById(R.id.menu_button);
@@ -107,6 +108,11 @@
             @Override
             public NewTabPage getNewTabPageForCurrentTab() {
                 return null;
+            }
+
+            @Override
+            public int getLoadProgress() {
+                return 0;
             }
 
             @Override
@@ -180,7 +186,7 @@
     /**
      * @return The {@link ProgressBar} this layout uses.
      */
-    ToolbarProgressBar getProgressBar() {
+    SmoothProgressBar getProgressBar() {
         return mProgressBar;
     }
 
@@ -497,33 +503,11 @@
     }
 
     /**
-     * Starts load progress.
-     */
-    protected void startLoadProgress() {
-        if (mProgressBar != null) {
-            mProgressBar.start();
-        }
-    }
-
-    /**
      * Sets load progress.
-     * @param progress The load progress between 0 and 1.
-     */
-    protected void setLoadProgress(float progress) {
-        if (mProgressBar != null) {
-            mProgressBar.setProgress(progress);
-        }
-    }
-
-    /**
-     * Finishes load progress.
-     * @param delayed Whether hiding progress bar should be delayed to give enough time for user to
-     *                        recognize the last state.
-     */
-    protected void finishLoadProgress(boolean delayed) {
-        if (mProgressBar != null) {
-            mProgressBar.finish(delayed);
-        }
+     * @param progress The load progress between 0 and 100.
+     */
+    protected void setLoadProgress(int progress) {
+        if (mProgressBar != null) mProgressBar.setProgress(progress);
     }
 
     /**