Revert of Add getThemeColor to Tab and add plumbing for ChromeActivites.

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index c7da06127ab0a08e91d0f7285f4bd31cc05f3e61..e448686d8b37e06203aa67f015aa7e1c959613a1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -99,7 +99,6 @@
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.chrome.browser.tab.ChromeTab;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
@@ -214,8 +213,6 @@
 
     private OnPreDrawListener mFirstDrawListener;
 
-    protected int mThemeColor;
-
     private final Locale mCurrentLocale = Locale.getDefault();
 
     private AssistStatusHandler mAssistStatusHandler;
@@ -513,40 +510,11 @@
             public void onCrash(Tab tab, boolean sadTabShown) {
                 postDeferredStartupIfNeeded();
             }
-
-            @Override
-            public void onDidChangeThemeColor(int color) {
-                checkThemeColorUpdate();
-            }
-
-            @Override
-            public void onWebContentsSwapped(Tab tab, boolean didStartLoad, boolean didFinishLoad) {
-                if (!didStartLoad) return;
-                checkThemeColorUpdate();
-            }
-
-            @Override
-            public void onSSLStateUpdated(Tab tab) {
-                checkThemeColorUpdate();
-            }
-
-            @Override
-            public void onDidAttachInterstitialPage(Tab tab) {
-                checkThemeColorUpdate();
-            }
         };
 
         if (mAssistStatusHandler != null) {
             mAssistStatusHandler.setTabModelSelector(tabModelSelector);
         }
-    }
-
-    private void checkThemeColorUpdate() {
-        if (getActivityTab() == null) return;
-        int themeColor = ChromeTab.fromTab(getActivityTab()).getThemeColor();
-        if (mThemeColor == themeColor) return;
-        mThemeColor = themeColor;
-        onThemeColorUpdate();
     }
 
     @Override
@@ -1494,15 +1462,4 @@
 
     @Override
     public void onSceneChange(Layout layout) { }
-
-    /**
-     * Gets called when the theme color corresponding to current tab changes.
-     */
-    protected void onThemeColorUpdate() {
-        if (mToolbarManager == null) return;
-        mToolbarManager.updatePrimaryColor(mThemeColor);
-        ControlContainer controlContainer =
-                (ControlContainer) findViewById(R.id.control_container);
-        controlContainer.getToolbarResourceAdapter().invalidate(null);
-    }
 }