Re-lands 58186:

chrome/browser/automation/testing_automation_provider.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/browser/automation/testing_automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 861 matching lines @@
 void TestingAutomationProvider::WindowSimulateKeyPress(
     const IPC::Message& message,
     int handle,
     int key,
     int flags) {
   if (!window_tracker_->ContainsHandle(handle))
     return;
 
   gfx::NativeWindow window = window_tracker_->GetResource(handle);
   // The key event is sent to whatever window is active.
-  ui_controls::SendKeyPress(window, static_cast<base::KeyboardCode>(key),
+  ui_controls::SendKeyPress(window, static_cast<app::KeyboardCode>(key),
                            ((flags & views::Event::EF_CONTROL_DOWN) ==
                               views::Event::EF_CONTROL_DOWN),
                             ((flags & views::Event::EF_SHIFT_DOWN) ==
                               views::Event::EF_SHIFT_DOWN),
                             ((flags & views::Event::EF_ALT_DOWN) ==
                               views::Event::EF_ALT_DOWN),
                             ((flags & views::Event::EF_COMMAND_DOWN) ==
                               views::Event::EF_COMMAND_DOWN));
 }
 
@@ skipping 1071 matching lines @@
   DCHECK(type == NotificationType::SESSION_END);
   // OnBrowserRemoving does a ReleaseLater. When session end is received we exit
   // before the task runs resulting in this object not being deleted. This
   // Release balance out the Release scheduled by OnBrowserRemoving.
   Release();
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }