Revert of [Andorid] ClipDrawable progress bar experiment.

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
index 376f480cd557d59257a2197fedb8c5f23ec562fa..928c8808c3e402abcbbe50945651b31b574a8831 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
@@ -27,7 +27,7 @@ import org.chromium.chrome.browser.TabObserver;
 import org.chromium.chrome.browser.UrlUtilities;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
 import org.chromium.chrome.browser.appmenu.AppMenuHandler;
-import org.chromium.chrome.browser.widget.ClipDrawableProgressBar;
+import org.chromium.chrome.browser.widget.SmoothProgressBar;
 import org.chromium.chrome.shell.omnibox.SuggestionPopup;
 import org.chromium.content.common.ContentSwitches;
 
@@ -35,22 +35,32 @@ import org.chromium.content.common.ContentSwitches;
  * A Toolbar {@link View} that shows the URL and navigation buttons.
  */
 public class ChromeShellToolbar extends LinearLayout {
+    private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
+
+    private final Runnable mClearProgressRunnable = new Runnable() {
+        @Override
+        public void run() {
+            mProgressBar.setProgress(0);
+        }
+    };
 
     private final Runnable mUpdateProgressRunnable = new Runnable() {
         @Override
         public void run() {
-            mProgressBar.setProgress(100 * mProgress);
+            mProgressBar.setProgress(mProgress);
             if (mLoading) {
                 mStopReloadButton.setImageResource(
                         R.drawable.btn_close);
             } else {
                 mStopReloadButton.setImageResource(R.drawable.btn_toolbar_reload);
+                ApiCompatibilityUtils.postOnAnimationDelayed(ChromeShellToolbar.this,
+                        mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
             }
         }
     };
 
     private EditText mUrlTextView;
-    private ClipDrawableProgressBar mProgressBar;
+    private SmoothProgressBar mProgressBar;
 
     private ChromeShellTab mTab;
     private final TabObserver mTabObserver;
@@ -113,6 +123,7 @@ public class ChromeShellToolbar extends LinearLayout {
     }
 
     private void onLoadProgressChanged(int progress) {
+        removeCallbacks(mClearProgressRunnable);
         removeCallbacks(mUpdateProgressRunnable);
         mProgress = progress;
         mLoading = progress != 100;
@@ -130,7 +141,7 @@ public class ChromeShellToolbar extends LinearLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = (ClipDrawableProgressBar) findViewById(R.id.progress);
+        mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
         initializeUrlField();
         initializeTabSwitcherButton();
         initializeMenuButton();