Use the correct observer in TabThemeTest

chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java
index 569e28e7eefde749bef7af6cf55a7ad3d1158660..7115e4b35c4f7fdf2ceabb2e1582ae1853520c5a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java
@@ -11,11 +11,10 @@ import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
-import org.chromium.content_public.browser.WebContents;
-import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.util.concurrent.Callable;
@@ -37,22 +36,27 @@ public class TabThemeTest extends ChromeActivityTestCaseBase<ChromeTabbedActivit
     /**
      * A WebContentsObserver for watching changes in the theme color.
      */
-    private static class ThemeColorWebContentsObserver extends WebContentsObserver {
+    private static class ThemeColorWebContentsObserver extends EmptyTabObserver {
         private CallbackHelper mCallbackHelper;
+        private int mColor;
 
-        public ThemeColorWebContentsObserver(WebContents webContents) {
-            super(webContents);
+        public ThemeColorWebContentsObserver() {
             mCallbackHelper = new CallbackHelper();
         }
 
         @Override
-        public void didChangeThemeColor(int color) {
+        public void onDidChangeThemeColor(Tab tab, int color) {
+            mColor = color;
             mCallbackHelper.notifyCalled();
         }
 
         public CallbackHelper getCallbackHelper() {
             return mCallbackHelper;
         }
+
+        public int getColor() {
+            return mColor;
+        }
     }
 
     public TabThemeTest() {
@@ -86,9 +90,9 @@ public class TabThemeTest extends ChromeActivityTestCaseBase<ChromeTabbedActivit
 
         final Tab tab = getActivity().getActivityTab();
 
-        ThemeColorWebContentsObserver colorObserver =
-                new ThemeColorWebContentsObserver(tab.getWebContents());
+        ThemeColorWebContentsObserver colorObserver = new ThemeColorWebContentsObserver();
         CallbackHelper themeColorHelper = colorObserver.getCallbackHelper();
+        tab.addObserver(colorObserver);
 
         // Navigate to a themed page.
         int curCallCount = themeColorHelper.getCallCount();
@@ -111,18 +115,21 @@ public class TabThemeTest extends ChromeActivityTestCaseBase<ChromeTabbedActivit
         curCallCount = themeColorHelper.getCallCount();
         loadUrl(testServer.getURL(THEMED_TEST_PAGE));
         themeColorHelper.waitForCallback(curCallCount, 1);
+        assertColorsEqual(THEME_COLOR, colorObserver.getColor());
         assertColorsEqual(THEME_COLOR, tab.getThemeColor());
 
         // Navigate to a non-native non-themed page.
         curCallCount = themeColorHelper.getCallCount();
         loadUrl(testServer.getURL(TEST_PAGE));
         themeColorHelper.waitForCallback(curCallCount, 1);
+        assertColorsEqual(tab.getDefaultThemeColor(), colorObserver.getColor());
         assertColorsEqual(tab.getDefaultThemeColor(), tab.getThemeColor());
 
         // Navigate to a themed page from a non-native page.
         curCallCount = themeColorHelper.getCallCount();
         loadUrl(testServer.getURL(THEMED_TEST_PAGE));
         themeColorHelper.waitForCallback(curCallCount, 1);
+        assertColorsEqual(THEME_COLOR, colorObserver.getColor());
         assertColorsEqual(THEME_COLOR, tab.getThemeColor());
     }
 }