components/html_viewer/html_frame_apptest.cc - Issue 1344573002: Mandoline: Rename components/view_manager to components/mus

Side by Side Diff: components/html_viewer/html_frame_apptest.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 3 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 | « components/html_viewer/html_frame.cc ('k') | components/html_viewer/html_frame_tree_manager.cc » ('j') | no next file with comments »

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 "base/auto_reset.h"	5 #include "base/auto_reset.h"

6 #include "base/bind.h"	6 #include "base/bind.h"

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/json/json_reader.h"	9 #include "base/json/json_reader.h"

10 #include "base/run_loop.h"	10 #include "base/run_loop.h"

11 #include "base/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

12 #include "base/test/test_timeouts.h"	12 #include "base/test/test_timeouts.h"

13 #include "base/values.h"	13 #include "base/values.h"

14 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"	14 #include "components/html_viewer/public/interfaces/test_html_viewer.mojom.h"

15 #include "components/view_manager/public/cpp/tests/view_manager_test_base.h"	15 #include "components/mus/public/cpp/tests/view_manager_test_base.h"

16 #include "components/view_manager/public/cpp/view.h"	16 #include "components/mus/public/cpp/view.h"

17 #include "components/view_manager/public/cpp/view_tree_connection.h"	17 #include "components/mus/public/cpp/view_tree_connection.h"

18 #include "components/web_view/frame.h"	18 #include "components/web_view/frame.h"

19 #include "components/web_view/frame_connection.h"	19 #include "components/web_view/frame_connection.h"

20 #include "components/web_view/frame_tree.h"	20 #include "components/web_view/frame_tree.h"

21 #include "components/web_view/public/interfaces/frame_tree.mojom.h"	21 #include "components/web_view/public/interfaces/frame_tree.mojom.h"

22 #include "components/web_view/test_frame_tree_delegate.h"	22 #include "components/web_view/test_frame_tree_delegate.h"

23 #include "mojo/application/public/cpp/application_impl.h"	23 #include "mojo/application/public/cpp/application_impl.h"

24 #include "net/test/spawned_test_server/spawned_test_server.h"	24 #include "net/test/spawned_test_server/spawned_test_server.h"

25 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessib ility.mojom.h"	25 #include "third_party/mojo_services/src/accessibility/public/interfaces/accessib ility.mojom.h"

26	26

27 using web_view::Frame;	27 using web_view::Frame;

(...skipping 440 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
468 script_value_as_list->GetString(0u, &message_in_child);	468 script_value_as_list->GetString(0u, &message_in_child);

469 }	469 }

470 }	470 }

471 } while (message_in_child != "hello from parent" &&	471 } while (message_in_child != "hello from parent" &&

472 base::TimeTicks::Now() - start_time <	472 base::TimeTicks::Now() - start_time <

473 TestTimeouts::action_timeout());	473 TestTimeouts::action_timeout());

474 EXPECT_EQ("hello from parent", message_in_child);	474 EXPECT_EQ("hello from parent", message_in_child);

475 }	475 }

476	476

477 } // namespace mojo	477 } // namespace mojo

OLD	NEW