| OLD | NEW |
| 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 <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 } | 560 } |
| 561 | 561 |
| 562 TEST_F(ViewManagerTest, MultipleEmbedRootsBeforeWTHReady) { | 562 TEST_F(ViewManagerTest, MultipleEmbedRootsBeforeWTHReady) { |
| 563 ASSERT_TRUE(InitEmbed(view_manager_init_.get(), kTestServiceURL, 2)); | 563 ASSERT_TRUE(InitEmbed(view_manager_init_.get(), kTestServiceURL, 2)); |
| 564 connection_->DoRunLoopUntilChangesCount(2); | 564 connection_->DoRunLoopUntilChangesCount(2); |
| 565 EXPECT_EQ(kTestServiceURL, connection_->changes()[0].embed_url); | 565 EXPECT_EQ(kTestServiceURL, connection_->changes()[0].embed_url); |
| 566 EXPECT_EQ(kTestServiceURL, connection_->changes()[1].embed_url); | 566 EXPECT_EQ(kTestServiceURL, connection_->changes()[1].embed_url); |
| 567 } | 567 } |
| 568 | 568 |
| 569 // Verifies client gets a valid id. | 569 // Verifies client gets a valid id. |
| 570 TEST_F(ViewManagerTest, ValidId) { | 570 #if defined(OS_LINUX) |
| 571 // http://crbug.com/396492 |
| 572 #define MAYBE_ValidId DISABLED_ValidId |
| 573 #else |
| 574 #define MAYBE_ValidId ValidId |
| 575 #endif |
| 576 TEST_F(ViewManagerTest, MAYBE_ValidId) { |
| 571 // TODO(beng): this should really have the URL of the application that | 577 // TODO(beng): this should really have the URL of the application that |
| 572 // connected to ViewManagerInit. | 578 // connected to ViewManagerInit. |
| 573 EXPECT_EQ("OnEmbed creator=", | 579 EXPECT_EQ("OnEmbed creator=", |
| 574 ChangesToDescription1(connection_->changes())[0]); | 580 ChangesToDescription1(connection_->changes())[0]); |
| 575 | 581 |
| 576 // All these tests assume 1 for the client id. The only real assertion here is | 582 // All these tests assume 1 for the client id. The only real assertion here is |
| 577 // the client id is not zero, but adding this as rest of code here assumes 1. | 583 // the client id is not zero, but adding this as rest of code here assumes 1. |
| 578 EXPECT_EQ(1, connection_->changes()[0].connection_id); | 584 EXPECT_EQ(1, connection_->changes()[0].connection_id); |
| 579 } | 585 } |
| 580 | 586 |
| (...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1465 // that SetBounsdNodes/AddNode and the like don't result in messages to the | 1471 // that SetBounsdNodes/AddNode and the like don't result in messages to the |
| 1466 // originating connection. | 1472 // originating connection. |
| 1467 | 1473 |
| 1468 // TODO(beng): Add tests for focus: | 1474 // TODO(beng): Add tests for focus: |
| 1469 // - focus between two nodes known to a connection | 1475 // - focus between two nodes known to a connection |
| 1470 // - focus between nodes unknown to one of the connections. | 1476 // - focus between nodes unknown to one of the connections. |
| 1471 // - focus between nodes unknown to either connection. | 1477 // - focus between nodes unknown to either connection. |
| 1472 | 1478 |
| 1473 } // namespace service | 1479 } // namespace service |
| 1474 } // namespace mojo | 1480 } // namespace mojo |
| OLD | NEW |