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> |
| 6 |
5 #include "base/macros.h" | 7 #include "base/macros.h" |
6 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
7 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
8 #include "components/guest_view/browser/guest_view_manager.h" | 10 #include "components/guest_view/browser/guest_view_manager.h" |
9 #include "components/guest_view/browser/guest_view_manager_factory.h" | 11 #include "components/guest_view/browser/guest_view_manager_factory.h" |
10 #include "components/guest_view/browser/test_guest_view_manager.h" | 12 #include "components/guest_view/browser/test_guest_view_manager.h" |
11 #include "content/public/browser/notification_service.h" | 13 #include "content/public/browser/notification_service.h" |
12 #include "content/public/browser/render_process_host.h" | 14 #include "content/public/browser/render_process_host.h" |
13 #include "content/public/browser/render_process_host_observer.h" | 15 #include "content/public/browser/render_process_host_observer.h" |
14 #include "content/public/test/browser_test_utils.h" | 16 #include "content/public/test/browser_test_utils.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 RenderProcessHostObserverForExit bad_app_obs( | 245 RenderProcessHostObserverForExit bad_app_obs( |
244 extensions::ProcessManager::Get(browser()->profile()) | 246 extensions::ProcessManager::Get(browser()->profile()) |
245 ->GetBackgroundHostForExtension(bad_app->id()) | 247 ->GetBackgroundHostForExtension(bad_app->id()) |
246 ->render_process_host()); | 248 ->render_process_host()); |
247 scoped_ptr<base::DictionaryValue> fake_embed_request_param( | 249 scoped_ptr<base::DictionaryValue> fake_embed_request_param( |
248 new base::DictionaryValue); | 250 new base::DictionaryValue); |
249 fake_embed_request_param->SetInteger(appview::kGuestInstanceID, | 251 fake_embed_request_param->SetInteger(appview::kGuestInstanceID, |
250 guest_instance_id); | 252 guest_instance_id); |
251 fake_embed_request_param->SetString(appview::kEmbedderID, host_app->id()); | 253 fake_embed_request_param->SetString(appview::kEmbedderID, host_app->id()); |
252 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( | 254 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( |
253 browser()->profile(), fake_embed_request_param.Pass(), bad_app); | 255 browser()->profile(), std::move(fake_embed_request_param), bad_app); |
254 bad_app_obs.WaitUntilRenderProcessHostKilled(); | 256 bad_app_obs.WaitUntilRenderProcessHostKilled(); |
255 // Now ask the guest to continue embedding. | 257 // Now ask the guest to continue embedding. |
256 ASSERT_TRUE( | 258 ASSERT_TRUE( |
257 ExecuteScript(extensions::ProcessManager::Get(browser()->profile()) | 259 ExecuteScript(extensions::ProcessManager::Get(browser()->profile()) |
258 ->GetBackgroundHostForExtension(guest_app->id()) | 260 ->GetBackgroundHostForExtension(guest_app->id()) |
259 ->web_contents(), | 261 ->web_contents(), |
260 "continueEmbedding();")); | 262 "continueEmbedding();")); |
261 } | 263 } |
OLD | NEW |