Revert 162252 - Make Web Intents picker in Views conform to latest mocks

chrome/browser/ui/views/constrained_window_views_browsertest.cc

 // 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.
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 96 matching lines @@
 //    accelerator targets until they are displayed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(web_contents != NULL);
   ConstrainedWindowTabHelper* constrained_window_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents);
   ASSERT_TRUE(constrained_window_helper != NULL);
 
   // Create a constrained dialog.  It will attach itself to tab_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);
-  ConstrainedWindowViews* window1 = new ConstrainedWindowViews(
-      web_contents, test_dialog1.get(), false,
-      ConstrainedWindowViews::DEFAULT_INSETS);
+  ConstrainedWindowViews* window1 =
+      new ConstrainedWindowViews(web_contents, test_dialog1.get(), false);
 
   views::FocusManager* focus_manager = window1->GetFocusManager();
   ASSERT_TRUE(focus_manager);
 
   // test_dialog1's text field should be focused.
   EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   // Now create a second constrained dialog.  This will also be attached to
   // tab_contents, but will remain hidden since the test_dialog1 is still
   // showing.
   scoped_ptr<TestConstrainedDialog> test_dialog2(new TestConstrainedDialog);
-  ConstrainedWindowViews* window2 = new ConstrainedWindowViews(
-      web_contents, test_dialog2.get(), false,
-      ConstrainedWindowViews::DEFAULT_INSETS);
+  ConstrainedWindowViews* window2 =
+      new ConstrainedWindowViews(web_contents, test_dialog2.get(), false);
   // Should be the same focus_manager.
   ASSERT_EQ(focus_manager, window2->GetFocusManager());
 
   // test_dialog1's text field should still be the view that has focus.
   EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
   ASSERT_EQ(2u, constrained_window_helper->constrained_window_count());
 
   // Now send a VKEY_RETURN to the browser.  This should result in closing
   // test_dialog1.
@@ skipping 36 matching lines @@
 // closed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabCloseTest) {
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(web_contents != NULL);
   ConstrainedWindowTabHelper* constrained_window_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents);
   ASSERT_TRUE(constrained_window_helper != NULL);
 
   // Create a constrained dialog.  It will attach itself to tab_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
-  ConstrainedWindowViews* window = new ConstrainedWindowViews(
-      web_contents, test_dialog.get(), true,
-      ConstrainedWindowViews::DEFAULT_INSETS);
+  ConstrainedWindowViews* window =
+      new ConstrainedWindowViews(web_contents, test_dialog.get(), true);
 
   bool closed =
       browser()->tab_strip_model()->CloseTabContentsAt(
           browser()->tab_strip_model()->active_index(),
           TabStripModel::CLOSE_NONE);
   EXPECT_TRUE(closed);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog->done());
 }