Extend asserts in BaseChromiumApplication to cover ToolbarCallbackWrapper

base/android/java/src/org/chromium/base/BaseChromiumApplication.java

Index: base/android/java/src/org/chromium/base/BaseChromiumApplication.java
diff --git a/base/android/java/src/org/chromium/base/BaseChromiumApplication.java b/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
index 6c330e69d719794b12452e2cfab3c4b5df1a51b1..6f315ceede906d38df4bb2969ce7f076a2d487da 100644
--- a/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
+++ b/base/android/java/src/org/chromium/base/BaseChromiumApplication.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Proxy;
 public class BaseChromiumApplication extends Application {
 
     private static final String TAG = "cr.base";
+    private static final String TOOLBAR_CALLBACK_WRAPPER_CLASS =
+            "android.support.v7.internal.app.ToolbarActionBar$ToolbarCallbackWrapper";
     private final boolean mShouldInitializeApplicationStatusTracking;
 
     public BaseChromiumApplication() {
@@ -152,32 +154,44 @@ public class BaseChromiumApplication extends Application {
 
             @Override
             public void onActivityDestroyed(Activity activity) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
 
             @Override
             public void onActivityPaused(Activity activity) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
 
             @Override
             public void onActivityResumed(Activity activity) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
 
             @Override
             public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
 
             @Override
             public void onActivityStarted(Activity activity) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
 
             @Override
             public void onActivityStopped(Activity activity) {
-                assert Proxy.isProxyClass(activity.getWindow().getCallback().getClass());
+                assert (Proxy.isProxyClass(activity.getWindow().getCallback().getClass())
+                        || activity.getWindow().getCallback().getClass().getName().equals(
+                                TOOLBAR_CALLBACK_WRAPPER_CLASS));
             }
         });
     }