Revert 178037

chrome/test/automation/automation_proxy.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 168 matching lines @@
   // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
   // message from AutomationProxy, unpacks the messages and routes that call to
   // the tracker.
   virtual void InvalidateHandle(const IPC::Message& message);
 
   // Creates a tab that can hosted in an external process. The function
   // returns a TabProxy representing the tab as well as a window handle
   // that can be reparented in another process.
   scoped_refptr<TabProxy> CreateExternalTab(
       const ExternalTabSettings& settings,
-      gfx::AcceleratedWidget* external_tab_container,
-      gfx::AcceleratedWidget* tab);
+      gfx::NativeWindow* external_tab_container,
+      gfx::NativeWindow* tab);
 
   base::TimeDelta action_timeout() const {
     return action_timeout_;
   }
 
   // Sets the timeout for subsequent automation calls.
   void set_action_timeout(base::TimeDelta timeout) {
     DCHECK(timeout <= base::TimeDelta::FromMinutes(10))
         << "10+ min of automation timeout "
            "can make the test hang and be killed by buildbot";
@@ skipping 58 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta action_timeout_;
 
   base::PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_