Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Side by Side Diff: chrome/browser/ui/views/web_dialog_view_browsertest.cc

Issue 288083002: linux_aura: Reenable a bunch of tests that were disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert the BookmarkBarView test enabling; those are still failing. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 DISALLOW_COPY_AND_ASSIGN(TestWebDialogView); 77 DISALLOW_COPY_AND_ASSIGN(TestWebDialogView);
78 }; 78 };
79 79
80 } // namespace 80 } // namespace
81 81
82 class WebDialogBrowserTest : public InProcessBrowserTest { 82 class WebDialogBrowserTest : public InProcessBrowserTest {
83 public: 83 public:
84 WebDialogBrowserTest() {} 84 WebDialogBrowserTest() {}
85 }; 85 };
86 86
87 // TODO(linux_aura) http://crbug.com/163931
88 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_AURA)
89 #define MAYBE_SizeWindow SizeWindow
90 #else
91 // http://code.google.com/p/chromium/issues/detail?id=52602 87 // http://code.google.com/p/chromium/issues/detail?id=52602
92 // Windows has some issues resizing windows- an off by one problem, 88 // Windows has some issues resizing windows- an off by one problem,
93 // and a minimum size that seems too big. This file isn't included in 89 // and a minimum size that seems too big. This file isn't included in
94 // Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS 90 // Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS
95 // doesn't allow resizing of windows. 91 // doesn't allow resizing of windows.
96 #define MAYBE_SizeWindow DISABLED_SizeWindow 92 IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
Elliot Glaysher 2014/05/15 22:35:49 I can't get this test to pass locally on linux aur
97 #endif
98
99 IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
100 ui::test::TestWebDialogDelegate* delegate = 93 ui::test::TestWebDialogDelegate* delegate =
101 new ui::test::TestWebDialogDelegate( 94 new ui::test::TestWebDialogDelegate(
102 GURL(chrome::kChromeUIChromeURLsURL)); 95 GURL(chrome::kChromeUIChromeURLsURL));
103 delegate->set_size(kInitialWidth, kInitialHeight); 96 delegate->set_size(kInitialWidth, kInitialHeight);
104 97
105 TestWebDialogView* view = 98 TestWebDialogView* view =
106 new TestWebDialogView(browser()->profile(), delegate); 99 new TestWebDialogView(browser()->profile(), delegate);
107 WebContents* web_contents = 100 WebContents* web_contents =
108 browser()->tab_strip_model()->GetActiveWebContents(); 101 browser()->tab_strip_model()->GetActiveWebContents();
109 ASSERT_TRUE(web_contents != NULL); 102 ASSERT_TRUE(web_contents != NULL);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // Check to make sure we can't get to 0x0 163 // Check to make sure we can't get to 0x0
171 set_bounds.set_width(0); 164 set_bounds.set_width(0);
172 set_bounds.set_height(0); 165 set_bounds.set_height(0);
173 166
174 view->MoveContents(web_contents, set_bounds); 167 view->MoveContents(web_contents, set_bounds);
175 content::RunMessageLoop(); // TestWebDialogView will quit. 168 content::RunMessageLoop(); // TestWebDialogView will quit.
176 actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen(); 169 actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
177 EXPECT_LT(0, actual_bounds.width()); 170 EXPECT_LT(0, actual_bounds.width());
178 EXPECT_LT(0, actual_bounds.height()); 171 EXPECT_LT(0, actual_bounds.height());
179 } 172 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/base_panel_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698