Re-lands 58186:

chrome/browser/automation/automation_provider_win.cc

 // Copyright (c) 2009 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/automation_provider.h"
 
+#include "app/keyboard_codes.h"
 #include "base/json/json_reader.h"
-#include "base/keyboard_codes.h"
 #include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_extension_function.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/automation/extension_port_container.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 174 matching lines @@
       MoveMouse(temp);
       SendMessage(top_level_hwnd, WM_MOUSEMOVE, wparam_flags,
                   MAKELPARAM(drag_path[i].x(), drag_path[i].y()));
     }
     POINT end = drag_path[drag_path.size() - 1].ToPOINT();
     MapWindowPoints(top_level_hwnd, HWND_DESKTOP, &end, 1);
     MoveMouse(end);
 
     if (press_escape_en_route) {
       // Press Escape.
-      ui_controls::SendKeyPress(window, base::VKEY_ESCAPE,
+      ui_controls::SendKeyPress(window, app::VKEY_ESCAPE,
                                ((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),
                                 false);
     }
     SendMessage(top_level_hwnd, up_message, wparam_flags,
                 MAKELPARAM(end.x, end.y));
@@ skipping 314 matching lines @@
 
 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     if (tab->tab_contents() && tab->tab_contents()->render_view_host()) {
       tab->tab_contents()->render_view_host()->Zoom(
           static_cast<PageZoom::Function>(zoom_level));
     }
   }
 }