Automated ui test porting + cleanup:...

chrome/browser/views/tabs/tab_dragging_test.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 85 matching lines @@
   //   ____________   ____________   ____________
   //  /            \ /            \ /            \
   // |    Tab_1     |     Tab_2    |    Tab_3     |
   //  ---- ---- ---- ---- ---- ---- ---- ---- ----
   //         x---- ---->
   //              ____________
   //             /     X      \
   //            |    Tab_1     |
   //             ---- ---- ----
 
-  POINT start;
-  POINT end;
-  start.x = bounds1.x() + bounds1.width()/2;
-  start.y = bounds1.y() + bounds1.height()/2;
-  end.x = start.x + 2*bounds1.width()/3;
-  end.y = start.y;
+  gfx::Point start(bounds1.x() + bounds1.width() / 2,
+                   bounds1.y() + bounds1.height() / 2);
+  gfx::Point end(start.x() + 2 * bounds1.width() / 3, start.y());
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now check for expected results.
   tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
@@ skipping 75 matching lines @@
   //   ____________   ____________   ____________
   //  /            \ /            \ /            \
   // |    Tab_1     |     Tab_2    |    Tab_3     |
   //  ---- ---- ---- ---- ---- ---- ---- ---- ----
   //         x---- ---- ---- ---- ---- ---->
   //                                  ____________
   //                                 /     X      \
   //                                |    Tab_1     |
   //                                 ---- ---- ----
 
-  POINT start;
-  POINT end;
-  start.x = bounds1.x() + bounds1.width()/2;
-  start.y = bounds1.y() + bounds1.height()/2;
-  end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2;
-  end.y = start.y;
+  gfx::Point start(bounds1.x() + bounds1.width() / 2,
+                   bounds1.y() + bounds1.height() / 2);
+  gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() +
+                     bounds3.width() / 2,
+                 start.y());
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now check for expected results.
   tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
   GURL tab1_new_url;
   ASSERT_TRUE(tab1->GetCurrentURL(&tab1_new_url));
 
@@ skipping 82 matching lines @@
   //   ____________   ____________   ____________
   //  /            \ /            \ /            \
   // |    Tab_1     |     Tab_2    |    Tab_3     |
   //  ---- ---- ---- ---- ---- ---- ---- ---- ----
   //         x---- ---- ---- ---- ---- ----> + ESCAPE
   //                                  ____________
   //                                 /     X      \
   //                                |    Tab_1     |
   //                                 ---- ---- ----
 
-  POINT start;
-  POINT end;
-  start.x = bounds1.x() + bounds1.width()/2;
-  start.y = bounds1.y() + bounds1.height()/2;
-  end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2;
-  end.y = start.y;
+  gfx::Point start(bounds1.x() + bounds1.width() / 2,
+                   bounds1.y() + bounds1.height() / 2);
+  gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() +
+                     bounds3.width() / 2,
+                 start.y());
 
   // Simulate drag with 'true' as the last parameter. This will interrupt
   // in-flight with Escape.
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     true));
 
   // Now check for expected results.
   tab1 = browser->GetTab(0);
   ASSERT_TRUE(tab1.get());
@@ skipping 97 matching lines @@
   //  ---- ---- ---- ---- ---- ---- ---- ---- ----
   //                       x
   //                       |
   //                       |  (Drag this below, out of tab strip)
   //                       V
   //                  ____________
   //                 /     X      \
   //                |    Tab_2     |   (New Window)
   //                ---- ---- ---- ---- ---- ---- ----
 
-  POINT start;
-  POINT end;
-  start.x = bounds2.x() + bounds2.width()/2;
-  start.y = bounds2.y() + bounds2.height()/2;
-  end.x = start.x;
-  end.y = start.y + 3*urlbar_bounds.height();
+  gfx::Point start(bounds2.x() + bounds2.width() / 2,
+                   bounds2.y() + bounds2.height() / 2);
+  gfx::Point end(start.x(),
+                 start.y() + 3 * urlbar_bounds.height());
 
   // Simulate tab drag.
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now, first make sure that the old window has only two tabs remaining.
   int new_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&new_tab_count));
   ASSERT_EQ(2, new_tab_count);
@@ skipping 29 matching lines @@
   scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0));
   ASSERT_TRUE(tab1_2.get());
   GURL tab1_2_url;
   ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url));
 
   // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1.
   EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab1_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab3_url.spec());
 }