OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/json/json_reader.h" | 13 #include "base/json/json_reader.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/test/test_timeouts.h" | 17 #include "base/test/test_timeouts.h" |
18 #include "base/time/time.h" | 18 #include "base/time/time.h" |
19 #include "base/values.h" | 19 #include "base/values.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h" | 21 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h" |
22 #include "components/mus/public/cpp/tests/window_server_test_base.h" | 22 #include "components/mus/public/cpp/tests/window_server_test_base.h" |
23 #include "components/mus/public/cpp/window.h" | 23 #include "components/mus/public/cpp/window.h" |
24 #include "components/mus/public/cpp/window_tree_connection.h" | 24 #include "components/mus/public/cpp/window_tree_connection.h" |
25 #include "components/web_view/frame.h" | 25 #include "components/web_view/frame.h" |
26 #include "components/web_view/frame_connection.h" | 26 #include "components/web_view/frame_connection.h" |
27 #include "components/web_view/frame_tree.h" | 27 #include "components/web_view/frame_tree.h" |
28 #include "components/web_view/public/interfaces/frame.mojom.h" | 28 #include "components/web_view/public/interfaces/frame.mojom.h" |
29 #include "components/web_view/test_frame_tree_delegate.h" | 29 #include "components/web_view/test_frame_tree_delegate.h" |
30 #include "mojo/application/public/cpp/application_impl.h" | |
31 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h" | 30 #include "mojo/services/accessibility/public/interfaces/accessibility.mojom.h" |
| 31 #include "mojo/shell/public/cpp/application_impl.h" |
32 #include "net/test/embedded_test_server/embedded_test_server.h" | 32 #include "net/test/embedded_test_server/embedded_test_server.h" |
33 | 33 |
34 using mus::mojom::WindowTreeClientPtr; | 34 using mus::mojom::WindowTreeClientPtr; |
35 using mus::WindowServerTestBase; | 35 using mus::WindowServerTestBase; |
36 using web_view::Frame; | 36 using web_view::Frame; |
37 using web_view::FrameConnection; | 37 using web_view::FrameConnection; |
38 using web_view::FrameTree; | 38 using web_view::FrameTree; |
39 using web_view::FrameTreeDelegate; | 39 using web_view::FrameTreeDelegate; |
40 using web_view::mojom::FrameClient; | 40 using web_view::mojom::FrameClient; |
41 | 41 |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 script_value_as_list->GetString(0u, &message_in_child); | 491 script_value_as_list->GetString(0u, &message_in_child); |
492 } | 492 } |
493 } | 493 } |
494 } while (message_in_child != "hello from parent" && | 494 } while (message_in_child != "hello from parent" && |
495 base::TimeTicks::Now() - start_time < | 495 base::TimeTicks::Now() - start_time < |
496 TestTimeouts::action_timeout()); | 496 TestTimeouts::action_timeout()); |
497 EXPECT_EQ("hello from parent", message_in_child); | 497 EXPECT_EQ("hello from parent", message_in_child); |
498 } | 498 } |
499 | 499 |
500 } // namespace mojo | 500 } // namespace mojo |
OLD | NEW |