Revert some of my automation provider changes. Maybe it's possible that GetResource() returns NULL when ContainsHandle() returns true? I can't repro locally and there is no try server for this.

Review URL: http://codereview.chromium.org/165510

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23404 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index c4ea434..5cbecf8 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1488,9 +1488,9 @@ void AutomationProvider::WindowGetViewBounds(int handle, int view_id,
                                              gfx::Rect* bounds) {
   *success = false;
 
-  gfx::NativeWindow window = window_tracker_->GetResource(handle);
-  if (window) {
+  if (window_tracker_->ContainsHandle(handle)) {
 #if defined(OS_WIN)
+    gfx::NativeWindow window = window_tracker_->GetResource(handle);
     views::RootView* root_view = views::WidgetWin::FindRootView(window);
     if (root_view) {
       views::View* view = root_view->GetViewByID(view_id);
@@ -1622,9 +1622,9 @@ void AutomationProvider::WindowSimulateClick(const IPC::Message& message,
                                              int handle,
                                              const gfx::Point& click,
                                              int flags) {
-  gfx::NativeWindow window = window_tracker_->GetResource(handle);
 
-  if (window) {
+  if (window_tracker_->ContainsHandle(handle)) {
+    gfx::NativeWindow window = window_tracker_->GetResource(handle);
     ui_controls::SendMouseMove(click.x(), click.y());
 
     ui_controls::MouseButton button = ui_controls::LEFT;
@@ -1652,8 +1652,8 @@ void AutomationProvider::WindowSimulateDrag(int handle,
                                             bool press_escape_en_route,
                                             IPC::Message* reply_message) {
   bool succeeded = false;
-  gfx::NativeWindow window = window_tracker_->GetResource(handle);
-  if (window && (drag_path.size() > 1)) {
+  if (window_tracker_->ContainsHandle(handle) && (drag_path.size() > 1)) {
+    gfx::NativeWindow window = window_tracker_->GetResource(handle);
     succeeded = true;
 
     UINT down_message = 0;
@@ -1726,10 +1726,10 @@ void AutomationProvider::WindowSimulateKeyPress(const IPC::Message& message,
                                                 int handle,
                                                 wchar_t key,
                                                 int flags) {
-  gfx::NativeWindow window = window_tracker_->GetResource(handle);
-  if (!window)
+  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, key,
                            ((flags & views::Event::EF_CONTROL_DOWN) ==
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index e8baf39..e187e71 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -346,8 +346,7 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) {
 }
 
 // Drag Tab_2 out of the Tab strip. A new window should open with this tab.
-// TODO (sidchat, estade): Fix this asap (Aug 13 2009)
-TEST_F(TabDraggingTest, DISABLED_Tab2OutOfTabStrip) {
+TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());