[Andorid] Migrate to ClipDrawable progress bar.

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 ab193ff9b4aea46b6119ba171c79ba0ec89ce829..31fa5f69369db7a7f90c06108628b4e26dd50f3e 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
@@ -26,7 +26,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.SmoothProgressBar;
+import org.chromium.chrome.browser.widget.ToolbarProgressBar;
 import org.chromium.chrome.shell.omnibox.SuggestionPopup;
 import org.chromium.content.common.ContentSwitches;
 
@@ -34,31 +34,29 @@ 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(mProgress);
-            if (mLoading) {
-                mStopReloadButton.setImageResource(
-                        R.drawable.btn_close);
+            mStopReloadButton.setImageResource(
+                    mLoading ? R.drawable.btn_close : R.drawable.btn_toolbar_reload);
+
+            // Note: We have an assertion in setProgress that checks if it's started.
+            //       Calling mProgressBar.start(); here is not ideal as it could be redundant.
+            //       But currently we didn't hook loading start/end events in Chrome shell and
+            //       anyways we will be deleting Chrome shell soon, so will leave as it is.
+            mProgressBar.start();
+            if (mProgress == 100.0f) {
+                if (mProgressBar.getProgress() != 1.0f) mProgressBar.setProgress(1.0f);
+                mProgressBar.finish(true);
             } else {
-                mStopReloadButton.setImageResource(R.drawable.btn_toolbar_reload);
-                postOnAnimationDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+                mProgressBar.setProgress(mProgress / 100.0f);
             }
         }
     };
 
     private EditText mUrlTextView;
-    private SmoothProgressBar mProgressBar;
+    private ToolbarProgressBar mProgressBar;
 
     private ChromeShellTab mTab;
     private final TabObserver mTabObserver;
@@ -121,7 +119,6 @@ public class ChromeShellToolbar extends LinearLayout {
     }
 
     private void onLoadProgressChanged(int progress) {
-        removeCallbacks(mClearProgressRunnable);
         removeCallbacks(mUpdateProgressRunnable);
         mProgress = progress;
         mLoading = progress != 100;
@@ -139,7 +136,7 @@ public class ChromeShellToolbar extends LinearLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mProgressBar = (SmoothProgressBar) findViewById(R.id.progress);
+        mProgressBar = (ToolbarProgressBar) findViewById(R.id.progress);
         initializeUrlField();
         initializeTabSwitcherButton();
         initializeMenuButton();