| Index: ui/android/window_android.cc
|
| diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
|
| index c53762c15137f715b790a1b2f0f170fc23c10a17..67c6cc1e4dad73072e6e88dc6f7bd723569301b0 100644
|
| --- a/ui/android/window_android.cc
|
| +++ b/ui/android/window_android.cc
|
| @@ -40,15 +40,20 @@ bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
|
| WindowAndroid::~WindowAndroid() {
|
| DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view.";
|
| DCHECK(!compositor_);
|
| + Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject());
|
| }
|
|
|
| -WindowAndroid* WindowAndroid::createForTesting() {
|
| +WindowAndroid* WindowAndroid::CreateForTesting() {
|
| JNIEnv* env = AttachCurrentThread();
|
| const JavaRef<jobject>& context = base::android::GetApplicationContext();
|
| return new WindowAndroid(
|
| env, Java_WindowAndroid_createForTesting(env, context).obj());
|
| }
|
|
|
| +void WindowAndroid::DestroyForTesting() {
|
| + delete this;
|
| +}
|
| +
|
| void WindowAndroid::OnCompositingDidCommit() {
|
| FOR_EACH_OBSERVER(WindowAndroidObserver,
|
| observer_list_,
|
|
|