Commit 8e00f57c authored by Henrique Nakashima's avatar Henrique Nakashima Committed by Commit Bot

Move assert isNativeInitialized() into TabModelJniBridge

The assert is for debugging as if native is not initialized this will
crash anyway. Moving it from IncognitoTabModelImpl breaks its dependency
on TabModelJniBridge.

Bug: 1109013
Change-Id: I3cd06e4f2115b315bb1ba3e7699e925a9b30c4aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511092Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823672}
parent dfd3a2c5
...@@ -101,11 +101,6 @@ public class IncognitoTabModelImpl implements IncognitoTabModel { ...@@ -101,11 +101,6 @@ public class IncognitoTabModelImpl implements IncognitoTabModel {
@Override @Override
public Profile getProfile() { public Profile getProfile() {
if (mDelegateModel instanceof TabModelJniBridge) {
TabModelJniBridge tabModel = (TabModelJniBridge) mDelegateModel;
assert tabModel.isNativeInitialized() && tabModel.getProfile() != null;
return tabModel.getProfile();
}
return mDelegateModel.getProfile(); return mDelegateModel.getProfile();
} }
......
...@@ -65,6 +65,7 @@ public abstract class TabModelJniBridge implements TabModel { ...@@ -65,6 +65,7 @@ public abstract class TabModelJniBridge implements TabModel {
@Override @Override
public Profile getProfile() { public Profile getProfile() {
assert isNativeInitialized();
return TabModelJniBridgeJni.get().getProfileAndroid( return TabModelJniBridgeJni.get().getProfileAndroid(
mNativeTabModelJniBridge, TabModelJniBridge.this); mNativeTabModelJniBridge, TabModelJniBridge.this);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment