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

Side by Side Diff: components/mus/ws/window_manager_client_apptest.cc

Issue 1770753002: [mus] Disable badly flaking apptest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 EXPECT_EQ(child21->id(), window_manager()->GetFocusedWindow()->id()); 838 EXPECT_EQ(child21->id(), window_manager()->GetFocusedWindow()->id());
839 EXPECT_EQ(child21->id(), embedded2->GetFocusedWindow()->id()); 839 EXPECT_EQ(child21->id(), embedded2->GetFocusedWindow()->id());
840 EXPECT_TRUE(WaitForNoWindowToHaveFocus(embedded1)); 840 EXPECT_TRUE(WaitForNoWindowToHaveFocus(embedded1));
841 EXPECT_EQ(nullptr, embedded1->GetFocusedWindow()); 841 EXPECT_EQ(nullptr, embedded1->GetFocusedWindow());
842 EXPECT_GT(ValidIndexOf(parent->children(), child2), 842 EXPECT_GT(ValidIndexOf(parent->children(), child2),
843 ValidIndexOf(parent->children(), child1)); 843 ValidIndexOf(parent->children(), child1));
844 EXPECT_GT(ValidIndexOf(parent->children(), child3), 844 EXPECT_GT(ValidIndexOf(parent->children(), child3),
845 ValidIndexOf(parent->children(), child1)); 845 ValidIndexOf(parent->children(), child1));
846 } 846 }
847 847
848 TEST_F(WindowServerTest, ActivationNext) { 848 // Very flaky: http://crbug.com/592313.
849 TEST_F(WindowServerTest, DISABLED_ActivationNext) {
849 Window* parent = GetFirstWMRoot(); 850 Window* parent = GetFirstWMRoot();
850 Window* child1 = NewVisibleWindow(parent, window_manager()); 851 Window* child1 = NewVisibleWindow(parent, window_manager());
851 Window* child2 = NewVisibleWindow(parent, window_manager()); 852 Window* child2 = NewVisibleWindow(parent, window_manager());
852 Window* child3 = NewVisibleWindow(parent, window_manager()); 853 Window* child3 = NewVisibleWindow(parent, window_manager());
853 854
854 WindowTreeConnection* embedded1 = Embed(child1).connection; 855 WindowTreeConnection* embedded1 = Embed(child1).connection;
855 ASSERT_NE(nullptr, embedded1); 856 ASSERT_NE(nullptr, embedded1);
856 WindowTreeConnection* embedded2 = Embed(child2).connection; 857 WindowTreeConnection* embedded2 = Embed(child2).connection;
857 ASSERT_NE(nullptr, embedded2); 858 ASSERT_NE(nullptr, embedded2);
858 WindowTreeConnection* embedded3 = Embed(child3).connection; 859 WindowTreeConnection* embedded3 = Embed(child3).connection;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1172 ASSERT_TRUE(window_in_wm); 1173 ASSERT_TRUE(window_in_wm);
1173 1174
1174 // Change the bounds in the wm, and make sure the child sees it. 1175 // Change the bounds in the wm, and make sure the child sees it.
1175 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); 1176 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
1176 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); 1177 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
1177 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); 1178 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
1178 } 1179 }
1179 1180
1180 } // namespace ws 1181 } // namespace ws
1181 } // namespace mus 1182 } // namespace mus
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698