Revert 114095 - Move the concept of Activation to the Shell.

chrome/browser/automation/testing_automation_provider_aura.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/base/ui_base_types.h"
 
 void TestingAutomationProvider::ActivateWindow(int handle) {
   aura::Window* window = window_tracker_->GetResource(handle);
   if (window) {
-    aura_shell::ActivateWindow(window);
+    window->Activate();
   }
 }
 
 void TestingAutomationProvider::IsWindowMaximized(int handle,
                                                   bool* is_maximized,
                                                   bool* success) {
   aura::Window* window = window_tracker_->GetResource(handle);
   if (window) {
     int show_state = window->GetIntProperty(aura::kShowStateKey);
     *is_maximized = (show_state == ui::SHOW_STATE_MAXIMIZED);
@@ skipping 49 matching lines @@
     *result = false;
   }
 }
 
 void TestingAutomationProvider::GetWindowTitle(int handle, string16* text) {
   const aura::Window* window = window_tracker_->GetResource(handle);
   DCHECK(window);
   *text = window->title();
 }