More refactoring for Viewer

tools/viewer/sk_app/android/Window_android.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Window_android.h"
 
-#include "VulkanTestContext_android.h"
+#include "VulkanWindowContext_android.h"
 
 namespace sk_app {
 
 Window* Window::CreateNativeWindow(void* platformData) {
     Window_android* window = new Window_android();
     if (!window->init((android_app*)platformData)) {
         delete window;
         return nullptr;
     }
     return window;
@@ skipping 25 matching lines @@
 
     // We delay the creation of fTestContext until Android informs us that
     // the native window is ready to use.
     return true;
 }
 
 void Window_android::initDisplay(ANativeWindow* window) {
     SkASSERT(window);
     ContextPlatformData_android platformData;
     platformData.fNativeWindow = window;
-    fTestContext = VulkanTestContext::Create((void*)&platformData, mSampleCount);
+    fWindowContext = VulkanWindowContext::Create((void*)&platformData, mSampleCount);
 }
 
 static void android_app_write_cmd(struct android_app* android_app, int8_t cmd) {
     if (write(android_app->msgwrite, &cmd, sizeof(cmd)) != sizeof(cmd)) {
         SkDebugf("Failure writing android_app cmd: %s\n", strerror(errno));
     }
 }
 
 void Window_android::inval() {
     android_app_write_cmd(mApp, APP_CMD_INVAL_WINDOW);
@@ skipping 107 matching lines @@
             Window::Key key = get_key(AKeyEvent_getKeyCode(event));
             Window::InputState state = get_action(AKeyEvent_getAction(event));
             int32_t mod = get_key_modifiers(event);
             window->onKey(key, state, mod);
             return true; // eat all key events
     }
     return 0;
 }
 
 }   // namespace sk_app