Re-lands 58186:

chrome/test/ui_test_utils.cc

 // Copyright (c) 2010 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/test/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 533 matching lines @@
   if (model->IsLoaded())
     return;
   BookmarkLoadObserver observer;
   model->AddObserver(&observer);
   RunMessageLoop();
   model->RemoveObserver(&observer);
   ASSERT_TRUE(model->IsLoaded());
 }
 
 bool SendKeyPressSync(gfx::NativeWindow window,
-                      base::KeyboardCode key,
+                      app::KeyboardCode key,
                       bool control,
                       bool shift,
                       bool alt,
                       bool command) {
   if (!ui_controls::SendKeyPressNotifyWhenDone(
           window, key, control, shift, alt, command,
           new MessageLoop::QuitTask())) {
     LOG(ERROR) << "ui_controls::SendKeyPressNotifyWhenDone failed";
     return false;
   }
@@ skipping 110 matching lines @@
 
 TestWebSocketServer::~TestWebSocketServer() {
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendSwitchASCII("server", "stop");
   cmd_line->AppendSwitch("chromium");
   cmd_line->AppendSwitchPath("pidfile", websocket_pid_file_);
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 }
 
 }  // namespace ui_test_utils