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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/test/scoped_feature_list.h" | 9 #include "base/test/scoped_feature_list.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
11 #include "components/guest_view/browser/guest_view_manager.h" | 11 #include "components/guest_view/browser/guest_view_manager.h" |
12 #include "components/guest_view/browser/guest_view_manager_factory.h" | 12 #include "components/guest_view/browser/guest_view_manager_factory.h" |
13 #include "components/guest_view/browser/test_guest_view_manager.h" | 13 #include "components/guest_view/browser/test_guest_view_manager.h" |
14 #include "content/public/browser/notification_service.h" | 14 #include "content/public/browser/notification_service.h" |
15 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/render_process_host.h" |
16 #include "content/public/browser/render_process_host_observer.h" | 16 #include "content/public/browser/render_process_host_observer.h" |
17 #include "content/public/common/content_features.h" | 17 #include "content/public/common/content_features.h" |
18 #include "content/public/common/content_switches.h" | |
Ilya Sherman
2017/06/12 21:50:29
This change seems unrelated. Could you please spl
chaopeng
2017/06/28 19:21:21
Removed.
| |
19 #include "content/public/test/browser_test_utils.h" | 18 #include "content/public/test/browser_test_utils.h" |
20 #include "content/public/test/test_utils.h" | 19 #include "content/public/test/test_utils.h" |
21 #include "extensions/browser/api/app_runtime/app_runtime_api.h" | 20 #include "extensions/browser/api/app_runtime/app_runtime_api.h" |
22 #include "extensions/browser/api/extensions_api_client.h" | 21 #include "extensions/browser/api/extensions_api_client.h" |
23 #include "extensions/browser/app_window/app_window_registry.h" | 22 #include "extensions/browser/app_window/app_window_registry.h" |
24 #include "extensions/browser/guest_view/app_view/app_view_constants.h" | 23 #include "extensions/browser/guest_view/app_view/app_view_constants.h" |
25 #include "extensions/browser/guest_view/app_view/app_view_guest.h" | 24 #include "extensions/browser/guest_view/app_view/app_view_guest.h" |
26 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h " | 25 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h " |
27 #include "extensions/browser/process_manager.h" | 26 #include "extensions/browser/process_manager.h" |
28 #include "extensions/common/switches.h" | 27 #include "extensions/common/switches.h" |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
279 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( | 278 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( |
280 browser()->profile(), std::move(fake_embed_request_param), bad_app); | 279 browser()->profile(), std::move(fake_embed_request_param), bad_app); |
281 bad_app_obs.WaitUntilRenderProcessHostKilled(); | 280 bad_app_obs.WaitUntilRenderProcessHostKilled(); |
282 // Now ask the guest to continue embedding. | 281 // Now ask the guest to continue embedding. |
283 ASSERT_TRUE( | 282 ASSERT_TRUE( |
284 ExecuteScript(extensions::ProcessManager::Get(browser()->profile()) | 283 ExecuteScript(extensions::ProcessManager::Get(browser()->profile()) |
285 ->GetBackgroundHostForExtension(guest_app->id()) | 284 ->GetBackgroundHostForExtension(guest_app->id()) |
286 ->web_contents(), | 285 ->web_contents(), |
287 "continueEmbedding();")); | 286 "continueEmbedding();")); |
288 } | 287 } |
OLD | NEW |