[VK] Follow up on naming cleanup.

In 1119610, there were some comments that were addressed, but the
updated patch was not uploaded by mistake. This patch just addresses
those comments.

TBR=yhanada@chromium.org, jamescook@chromium.org

Bug: 849980
Change-Id: Ida53707785789fda4b8ee687198932dd266477fb
Reviewed-on: https://chromium-review.googlesource.com/1124074
Commit-Queue: Darren Shen <shend@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572125}

ash/root_window_controller_unittest.cc

@@ -824,7 +824,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ClickWithActiveModalDialog) {
   ASSERT_EQ(root_window, controller->GetRootWindow());
 
   aura::Window* contents_window = controller->GetKeyboardWindow();
-  contents_window->SetName("KeyboardContentsWindow");
+  contents_window->SetName("KeyboardWindow");
   contents_window->SetBounds(
       keyboard::KeyboardBoundsFromRootBounds(root_window->bounds(), 100));
   contents_window->Show();

ui/keyboard/keyboard_controller.h

@@ -104,7 +104,6 @@ class KEYBOARD_EXPORT KeyboardController
 
   // Reloads the content of the keyboard. No-op if the keyboard content is not
   // loaded yet.
-  // TODO
   void Reload();
 
   // Notifies observers that the visual or occluded bounds of the keyboard

ui/keyboard/keyboard_ui.cc

@@ -19,7 +19,7 @@ KeyboardUI::~KeyboardUI() = default;
 
 void KeyboardUI::ShowKeyboardWindow() {
   if (HasKeyboardWindow()) {
-    TRACE_EVENT0("vk", "ShowKeyboardContainerWindow");
+    TRACE_EVENT0("vk", "ShowKeyboardWindow");
     GetKeyboardWindow()->Show();
   }
 }

ui/keyboard/keyboard_ui.h

@@ -24,7 +24,6 @@ namespace keyboard {
 class KeyboardController;
 
 // Interface representing a window containing virtual keyboard UI.
-// The window can load asynchronously.... blah.
 class KEYBOARD_EXPORT KeyboardUI {
  public:
   KeyboardUI();