[Android] Rename NativeWindow to WindowAndroid.

chrome/android/testshell/testshell_tab.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/android/testshell/testshell_tab.h"
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "jni/TestShellTab_jni.h"
-#include "ui/gfx/android/window_android.h"
+#include "ui/android/window_android.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using chrome::android::ChromeWebContentsDelegateAndroid;
 using content::WebContents;
 using ui::WindowAndroid;
 
 TestShellTab::TestShellTab(JNIEnv* env,
                            jobject obj,
@@ skipping 83 matching lines @@
                  jobject obj,
                  jint web_contents_ptr,
                  jint window_android_ptr) {
   TestShellTab* tab = new TestShellTab(
       env,
       obj,
       reinterpret_cast<WebContents*>(web_contents_ptr),
       reinterpret_cast<WindowAndroid*>(window_android_ptr));
   return reinterpret_cast<jint>(tab);
 }