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

Side by Side Diff: chrome/browser/ui/panels/old_docked_panel_browsertest.cc

Issue 10689082: Fix flaky linux panel tests related to active state checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove log msg Created 8 years, 5 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
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/message_loop.h" 5 #include "base/message_loop.h"
6 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h" 6 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
7 #include "chrome/browser/ui/panels/docked_panel_strip.h" 7 #include "chrome/browser/ui/panels/docked_panel_strip.h"
8 #include "chrome/browser/ui/panels/panel.h" 8 #include "chrome/browser/ui/panels/panel.h"
9 #include "chrome/browser/ui/panels/panel_manager.h" 9 #include "chrome/browser/ui/panels/panel_manager.h"
10 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h" 10 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
11 #include "chrome/common/chrome_notification_types.h" 11 #include "chrome/common/chrome_notification_types.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/notification_service.h" 13 #include "content/public/browser/notification_service.h"
14 14
15 // Panel tests are flaking on linux CQ. http://crbug.com/135377
16 #if !defined(OS_LINUX)
17
18 class OldDockedPanelBrowserTest : public OldBasePanelBrowserTest { 15 class OldDockedPanelBrowserTest : public OldBasePanelBrowserTest {
19 public: 16 public:
20 virtual void SetUpOnMainThread() OVERRIDE { 17 virtual void SetUpOnMainThread() OVERRIDE {
21 OldBasePanelBrowserTest::SetUpOnMainThread(); 18 OldBasePanelBrowserTest::SetUpOnMainThread();
22 19
23 // All the tests here assume using mocked 800x600 screen area for the 20 // All the tests here assume using mocked 800x600 screen area for the
24 // primary monitor. Do the check now. 21 // primary monitor. Do the check now.
25 gfx::Rect primary_screen_area = PanelManager::GetInstance()-> 22 gfx::Rect primary_screen_area = PanelManager::GetInstance()->
26 display_settings_provider()->GetPrimaryScreenArea(); 23 display_settings_provider()->GetPrimaryScreenArea();
27 DCHECK(primary_screen_area.width() == 800); 24 DCHECK(primary_screen_area.width() == 800);
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 // Wait for all processing to finish. 272 // Wait for all processing to finish.
276 MessageLoopForUI::current()->RunAllPending(); 273 MessageLoopForUI::current()->RunAllPending();
277 274
278 // We should not have squeezing any more; all panels should be at full width. 275 // We should not have squeezing any more; all panels should be at full width.
279 EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width()); 276 EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
280 EXPECT_EQ(panel4->GetBounds().width(), panel4->GetRestoredBounds().width()); 277 EXPECT_EQ(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
281 EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width()); 278 EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
282 279
283 panel_manager->CloseAll(); 280 panel_manager->CloseAll();
284 } 281 }
285
286 #endif // !OS_LINUX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698