Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "extensions/browser/process_manager.h" | 5 #include "extensions/browser/process_manager.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | |
| 8 #include "base/memory/scoped_ptr.h" | |
| 9 #include "base/run_loop.h" | |
| 10 #include "base/strings/stringprintf.h" | |
| 7 #include "chrome/browser/extensions/browser_action_test_util.h" | 11 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 12 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/test_extension_dir.h" | |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 16 #include "chrome/common/extensions/extension_process_policy.h" | |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
| 20 #include "content/public/browser/render_frame_host.h" | |
| 14 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
| 22 #include "content/public/test/browser_test_utils.h" | |
| 15 #include "content/public/test/test_utils.h" | 23 #include "content/public/test/test_utils.h" |
| 24 #include "extensions/common/value_builder.h" | |
| 25 #include "extensions/test/background_page_watcher.h" | |
| 26 #include "extensions/test/extension_test_message_listener.h" | |
| 16 #include "net/dns/mock_host_resolver.h" | 27 #include "net/dns/mock_host_resolver.h" |
| 17 #include "net/test/embedded_test_server/embedded_test_server.h" | 28 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 18 | 29 |
| 19 namespace extensions { | 30 namespace extensions { |
| 20 | 31 |
| 32 namespace { | |
| 33 | |
| 34 void AddFrameToSet(std::set<content::RenderFrameHost*>* frames, | |
| 35 content::RenderFrameHost* rfh) { | |
| 36 if (rfh->IsRenderFrameLive()) | |
| 37 frames->insert(rfh); | |
| 38 } | |
| 39 | |
| 40 } // namespace | |
| 41 | |
| 42 // Takes a snapshot of all frames upon construction. When Wait is called, a | |
|
Devlin
2015/12/01 21:40:49
nitty nit: s/Wait/Wait()
Devlin
2015/12/01 23:29:58
Missed this one.
| |
| 43 // MessageLoop is created and Quit when all previously recorded frames are | |
| 44 // either present in the tab, or deleted. | |
|
Devlin
2015/12/01 21:40:49
Elaborate on why we consider the case of all frame
robwu
2015/12/01 23:19:57
Done 2x.
| |
| 45 class NavigationCompletedObserver : public content::WebContentsObserver { | |
| 46 public: | |
| 47 explicit NavigationCompletedObserver(content::WebContents* web_contents) | |
| 48 : content::WebContentsObserver(web_contents), | |
| 49 message_loop_runner_(new content::MessageLoopRunner) { | |
| 50 web_contents->ForEachFrame( | |
| 51 base::Bind(&AddFrameToSet, base::Unretained(&frames_))); | |
| 52 } | |
| 53 | |
| 54 void Wait() { | |
| 55 if (!AreAllFramesInTab()) | |
| 56 message_loop_runner_->Run(); | |
| 57 } | |
| 58 | |
| 59 void RenderFrameDeleted(content::RenderFrameHost* rfh) override { | |
| 60 if (frames_.erase(rfh) != 0 && message_loop_runner_->loop_running() && | |
| 61 AreAllFramesInTab()) | |
| 62 message_loop_runner_->Quit(); | |
| 63 } | |
| 64 | |
| 65 private: | |
| 66 // Check whether all frames that were recorded at the construction of this | |
| 67 // class are still part of the tab. | |
| 68 bool AreAllFramesInTab() { | |
| 69 std::set<content::RenderFrameHost*> current_frames; | |
| 70 web_contents()->ForEachFrame( | |
| 71 base::Bind(&AddFrameToSet, base::Unretained(¤t_frames))); | |
| 72 for (content::RenderFrameHost* frame : frames_) { | |
| 73 if (current_frames.find(frame) == current_frames.end()) | |
| 74 return false; | |
| 75 } | |
| 76 return true; | |
| 77 } | |
| 78 | |
| 79 std::set<content::RenderFrameHost*> frames_; | |
| 80 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; | |
| 81 | |
| 82 DISALLOW_COPY_AND_ASSIGN(NavigationCompletedObserver); | |
| 83 }; | |
| 84 | |
| 21 // Exists as a browser test because ExtensionHosts are hard to create without | 85 // Exists as a browser test because ExtensionHosts are hard to create without |
| 22 // a real browser. | 86 // a real browser. |
| 23 typedef ExtensionBrowserTest ProcessManagerBrowserTest; | 87 class ProcessManagerBrowserTest : public ExtensionBrowserTest { |
| 88 public: | |
| 89 // Create an extension with web-accessible frames and an optional background | |
| 90 // page. | |
| 91 const Extension* CreateExtension(const std::string& name, | |
| 92 bool has_background_process) { | |
| 93 scoped_ptr<TestExtensionDir> dir(new TestExtensionDir()); | |
| 94 | |
| 95 DictionaryBuilder manifest; | |
| 96 manifest.Set("name", name) | |
| 97 .Set("version", "1") | |
| 98 .Set("manifest_version", 2) | |
| 99 // To allow ExecuteScript* to work. | |
| 100 .Set("content_security_policy", | |
| 101 "script-src 'self' 'unsafe-eval'; object-src 'self'") | |
| 102 .Set("sandbox", DictionaryBuilder().Set( | |
| 103 "pages", ListBuilder().Append("sandboxed.html"))) | |
| 104 .Set("web_accessible_resources", ListBuilder().Append("*")); | |
| 105 | |
| 106 if (has_background_process) { | |
| 107 manifest.Set("background", DictionaryBuilder().Set("page", "bg.html")); | |
| 108 dir->WriteFile(FILE_PATH_LITERAL("bg.html"), | |
| 109 "<iframe id=bgframe src=empty.html></iframe>"); | |
|
Devlin
2015/12/01 21:40:49
nit: id="bgframe" (also below)
robwu
2015/12/01 23:19:58
Done (using single quotes instead of double becaus
Devlin
2015/12/01 23:29:58
I don't see it in PS15?
robwu
2015/12/01 23:51:22
Apologies, I forgot to commit it. Try again.
| |
| 110 } | |
| 111 | |
| 112 dir->WriteFile(FILE_PATH_LITERAL("blank_iframe.html"), | |
| 113 "<iframe id=frame0 src='about:blank'></iframe>"); | |
| 114 | |
| 115 dir->WriteFile(FILE_PATH_LITERAL("srcdoc_iframe.html"), | |
| 116 "<iframe id=frame0 srcdoc='Hello world'></iframe>"); | |
| 117 | |
| 118 dir->WriteFile(FILE_PATH_LITERAL("two_iframes.html"), | |
| 119 "<iframe id=frame1 src=empty.html></iframe>" | |
| 120 "<iframe id=frame2 src=empty.html></iframe>"); | |
| 121 | |
| 122 dir->WriteFile(FILE_PATH_LITERAL("sandboxed.html"), "Some sandboxed page"); | |
| 123 | |
| 124 dir->WriteFile(FILE_PATH_LITERAL("empty.html"), ""); | |
| 125 | |
| 126 dir->WriteManifest(manifest.ToJSON()); | |
| 127 | |
| 128 const Extension* extension = LoadExtension(dir->unpacked_path()); | |
| 129 EXPECT_TRUE(extension); | |
| 130 temp_dirs_.push_back(dir.Pass()); | |
| 131 return extension; | |
| 132 } | |
| 133 | |
| 134 // ui_test_utils::NavigateToURL sometimes returns too early: It returns as | |
| 135 // soon as the StopLoading notification has been triggered. This does not | |
| 136 // imply that RenderFrameDeleted was called, so the test may continue too | |
| 137 // early and fail when ProcessManager::GetAllFrames() returns too many frames | |
| 138 // (namely frames that are in the process of being deleted). | |
| 139 void NavigateToURL(const GURL& url) { | |
| 140 NavigationCompletedObserver observer( | |
| 141 browser()->tab_strip_model()->GetActiveWebContents()); | |
| 142 | |
| 143 ui_test_utils::NavigateToURL(browser(), url); | |
| 144 | |
| 145 // Wait until the last RenderFrameHosts are deleted. This wait doesn't take | |
| 146 // long. | |
| 147 observer.Wait(); | |
| 148 } | |
| 149 | |
| 150 void NavigateIframeToURLAndWait(content::WebContents* web_contents, | |
| 151 const std::string iframe_id, | |
| 152 const GURL& url) { | |
| 153 // This is an improved version of content::NavigateIframeToURL. Unlike the | |
| 154 // other method, this does actually wait until the load of all child frames | |
| 155 // completes. | |
| 156 std::string script = base::StringPrintf( | |
| 157 "var frame = document.getElementById('%s');" | |
| 158 "frame.onload = frame.onerror = function(event) {" | |
| 159 " frame.onload = frame.onerror = null;" | |
| 160 " domAutomationController.send(event.type === 'load');" | |
| 161 "};" | |
| 162 "frame.src = '%s';", | |
| 163 iframe_id.c_str(), url.spec().c_str()); | |
| 164 bool is_loaded = false; | |
| 165 EXPECT_TRUE(ExecuteScriptAndExtractBool(web_contents, script, &is_loaded)); | |
| 166 EXPECT_TRUE(is_loaded); | |
| 167 } | |
| 168 | |
| 169 size_t IfExtensionsIsolated(size_t if_enabled, size_t if_disabled) { | |
| 170 return content::AreAllSitesIsolatedForTesting() || | |
| 171 IsIsolateExtensionsEnabled() | |
| 172 ? if_enabled | |
| 173 : if_disabled; | |
| 174 } | |
| 175 | |
| 176 private: | |
| 177 std::vector<scoped_ptr<TestExtensionDir>> temp_dirs_; | |
| 178 | |
| 179 DISALLOW_COPY_AND_ASSIGN(ProcessManagerBrowserTest); | |
| 180 }; | |
| 24 | 181 |
| 25 // Test that basic extension loading creates the appropriate ExtensionHosts | 182 // Test that basic extension loading creates the appropriate ExtensionHosts |
| 26 // and background pages. | 183 // and background pages. |
| 27 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, | 184 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, |
| 28 ExtensionHostCreation) { | 185 ExtensionHostCreation) { |
| 29 ProcessManager* pm = ProcessManager::Get(profile()); | 186 ProcessManager* pm = ProcessManager::Get(profile()); |
| 30 | 187 |
| 31 // We start with no background hosts. | 188 // We start with no background hosts. |
| 32 ASSERT_EQ(0u, pm->background_hosts().size()); | 189 ASSERT_EQ(0u, pm->background_hosts().size()); |
| 33 ASSERT_EQ(0u, pm->GetAllFrames().size()); | 190 ASSERT_EQ(0u, pm->GetAllFrames().size()); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 content::WebContents* extension_web_contents = | 307 content::WebContents* extension_web_contents = |
| 151 content::WebContents::FromRenderFrameHost( | 308 content::WebContents::FromRenderFrameHost( |
| 152 *pm->GetRenderFrameHostsForExtension(extension->id()).begin()); | 309 *pm->GetRenderFrameHostsForExtension(extension->id()).begin()); |
| 153 EXPECT_TRUE(extension_web_contents->GetSiteInstance() != | 310 EXPECT_TRUE(extension_web_contents->GetSiteInstance() != |
| 154 tab_web_contents->GetSiteInstance()); | 311 tab_web_contents->GetSiteInstance()); |
| 155 EXPECT_TRUE(pm->GetSiteInstanceForURL(extension->url()) != | 312 EXPECT_TRUE(pm->GetSiteInstanceForURL(extension->url()) != |
| 156 tab_web_contents->GetSiteInstance()); | 313 tab_web_contents->GetSiteInstance()); |
| 157 EXPECT_TRUE(pm->GetBackgroundHostForExtension(extension->id())); | 314 EXPECT_TRUE(pm->GetBackgroundHostForExtension(extension->id())); |
| 158 } | 315 } |
| 159 | 316 |
| 317 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, NoBackgroundPage) { | |
| 318 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | |
| 319 | |
| 320 ProcessManager* pm = ProcessManager::Get(profile()); | |
| 321 const Extension* extension = | |
| 322 LoadExtension(test_data_dir_.AppendASCII("api_test") | |
| 323 .AppendASCII("messaging") | |
| 324 .AppendASCII("connect_nobackground")); | |
| 325 ASSERT_TRUE(extension); | |
| 326 | |
| 327 // The extension has no background page. | |
| 328 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | |
| 329 | |
| 330 // Start in a non-extension process, then navigate to an extension process. | |
| 331 NavigateToURL(embedded_test_server()->GetURL("/empty.html")); | |
| 332 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | |
| 333 | |
| 334 const GURL extension_url = extension->url().Resolve("manifest.json"); | |
| 335 NavigateToURL(extension_url); | |
| 336 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | |
| 337 | |
| 338 NavigateToURL(GURL("about:blank")); | |
| 339 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | |
| 340 | |
| 341 ui_test_utils::NavigateToURLWithDisposition( | |
| 342 browser(), extension_url, NEW_FOREGROUND_TAB, | |
| 343 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | |
| 344 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | |
| 345 } | |
| 346 | |
| 347 // Tests whether frames are correctly classified. Non-extension frames should | |
| 348 // never appear in the list. Top-level extension frames should always appear. | |
| 349 // Child extension frames should only appear if it is hosted in an extension | |
| 350 // process (i.e. if the top-level frame is an extension page, or if OOP frames | |
| 351 // are enabled for extensions). | |
| 352 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, FrameClassification) { | |
| 353 const Extension* extension1 = CreateExtension("Extension 1", false); | |
| 354 const Extension* extension2 = CreateExtension("Extension 2", true); | |
| 355 embedded_test_server()->ServeFilesFromDirectory(extension1->path()); | |
| 356 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | |
| 357 | |
| 358 const GURL kExt1TwoFramesUrl(extension1->url().Resolve("two_iframes.html")); | |
| 359 const GURL kExt1EmptyUrl(extension1->url().Resolve("empty.html")); | |
| 360 const GURL kExt2TwoFramesUrl(extension2->url().Resolve("two_iframes.html")); | |
| 361 const GURL kExt2EmptyUrl(extension2->url().Resolve("empty.html")); | |
| 362 | |
| 363 ProcessManager* pm = ProcessManager::Get(profile()); | |
| 364 | |
| 365 // 1 background page + 1 frame in background page from Extension 2. | |
| 366 BackgroundPageWatcher(pm, extension2).WaitForOpen(); | |
| 367 EXPECT_EQ(2u, pm->GetAllFrames().size()); | |
| 368 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 369 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 370 | |
| 371 ExecuteScriptInBackgroundPageNoWait(extension2->id(), | |
| 372 "setTimeout(window.close, 0)"); | |
| 373 BackgroundPageWatcher(pm, extension2).WaitForClose(); | |
| 374 EXPECT_EQ(0u, pm->GetAllFrames().size()); | |
| 375 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 376 | |
| 377 NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html")); | |
| 378 EXPECT_EQ(0u, pm->GetAllFrames().size()); | |
| 379 | |
| 380 content::WebContents* tab = | |
| 381 browser()->tab_strip_model()->GetActiveWebContents(); | |
| 382 | |
| 383 // Tests extension frames in non-extension page. | |
|
Devlin
2015/12/01 21:40:49
Might be worth expanding on this to explain why th
robwu
2015/12/01 23:19:57
This is already explained before the test. When OO
| |
| 384 NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl); | |
| 385 EXPECT_EQ(IfExtensionsIsolated(1, 0), | |
| 386 pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 387 EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size()); | |
| 388 | |
| 389 NavigateIframeToURLAndWait(tab, "frame2", kExt2EmptyUrl); | |
| 390 EXPECT_EQ(IfExtensionsIsolated(1, 0), | |
| 391 pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 392 EXPECT_EQ(IfExtensionsIsolated(2, 0), pm->GetAllFrames().size()); | |
| 393 | |
| 394 // Tests non-extension page in extension frame. | |
| 395 NavigateToURL(kExt1TwoFramesUrl); | |
| 396 // 1 top-level + 2 child frames from Extension 1. | |
| 397 EXPECT_EQ(3u, pm->GetAllFrames().size()); | |
| 398 EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 399 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 400 | |
| 401 NavigateIframeToURLAndWait(tab, "frame1", | |
| 402 embedded_test_server()->GetURL("/empty.html")); | |
| 403 // 1 top-level + 1 child frame from Extension 1. | |
| 404 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 405 EXPECT_EQ(2u, pm->GetAllFrames().size()); | |
| 406 | |
| 407 NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl); | |
| 408 // 1 top-level + 2 child frames from Extension 1. | |
| 409 EXPECT_EQ(3u, pm->GetAllFrames().size()); | |
| 410 EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 411 | |
| 412 // Load a frame from another extension. | |
| 413 NavigateIframeToURLAndWait(tab, "frame1", kExt2EmptyUrl); | |
| 414 // 1 top-level + 1 child frame from Extension 1, | |
| 415 // 1 child frame from Extension 2. | |
| 416 EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size()); | |
| 417 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 418 EXPECT_EQ(IfExtensionsIsolated(1, 0), | |
| 419 pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 420 | |
| 421 // Destroy all existing frames by navigating to another extension. | |
| 422 NavigateToURL(extension2->url().Resolve("empty.html")); | |
| 423 EXPECT_EQ(1u, pm->GetAllFrames().size()); | |
| 424 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 425 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 426 | |
| 427 // Test about:blank and about:srcdoc child frames. | |
| 428 NavigateToURL(extension2->url().Resolve("srcdoc_iframe.html")); | |
| 429 // 1 top-level frame + 1 child frame from Extension 2. | |
| 430 EXPECT_EQ(2u, pm->GetAllFrames().size()); | |
| 431 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 432 | |
| 433 NavigateToURL(extension2->url().Resolve("blank_iframe.html")); | |
| 434 // 1 top-level frame + 1 child frame from Extension 2. | |
| 435 EXPECT_EQ(2u, pm->GetAllFrames().size()); | |
| 436 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 437 | |
| 438 // Sandboxed frames are not viewed as extension frames. | |
| 439 NavigateIframeToURLAndWait(tab, "frame0", | |
| 440 extension2->url().Resolve("sandboxed.html")); | |
| 441 // 1 top-level frame from Extension 2. | |
| 442 EXPECT_EQ(1u, pm->GetAllFrames().size()); | |
| 443 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 444 | |
| 445 NavigateToURL(extension2->url().Resolve("sandboxed.html")); | |
| 446 EXPECT_EQ(0u, pm->GetAllFrames().size()); | |
| 447 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 448 | |
| 449 // Test nested frames (same extension). | |
| 450 NavigateToURL(kExt2TwoFramesUrl); | |
| 451 // 1 top-level + 2 child frames from Extension 2. | |
| 452 EXPECT_EQ(3u, pm->GetAllFrames().size()); | |
| 453 EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 454 | |
| 455 NavigateIframeToURLAndWait(tab, "frame1", kExt2TwoFramesUrl); | |
| 456 // 1 top-level + 2 child frames from Extension 1, | |
| 457 // 2 child frames in frame1 from Extension 2. | |
| 458 EXPECT_EQ(5u, pm->GetAllFrames().size()); | |
| 459 EXPECT_EQ(5u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 460 | |
| 461 // The extension frame from the other extension should not be classified as an | |
| 462 // extension (unless out-of-process frames are enabled). | |
| 463 NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl); | |
| 464 // 1 top-level + 1 child frames from Extension 2, | |
| 465 // 1 child frame from Extension 1. | |
| 466 EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size()); | |
| 467 EXPECT_EQ(IfExtensionsIsolated(1, 0), | |
| 468 pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 469 EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 470 | |
| 471 NavigateIframeToURLAndWait(tab, "frame2", kExt1TwoFramesUrl); | |
| 472 // 1 top-level + 1 child frames from Extension 2, | |
| 473 // 1 child frame + 2 child frames in frame2 from Extension 1. | |
| 474 EXPECT_EQ(IfExtensionsIsolated(5, 1), pm->GetAllFrames().size()); | |
| 475 EXPECT_EQ(IfExtensionsIsolated(4, 0), | |
| 476 pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 477 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 478 | |
| 479 // Crash tab where the top-level frame is an extension frame. | |
| 480 content::CrashTab(tab); | |
| 481 EXPECT_EQ(0u, pm->GetAllFrames().size()); | |
| 482 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 483 EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size()); | |
| 484 | |
| 485 // Now load an extension page and a non-extension page... | |
| 486 ui_test_utils::NavigateToURLWithDisposition( | |
| 487 browser(), kExt1EmptyUrl, NEW_BACKGROUND_TAB, | |
| 488 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | |
| 489 NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html")); | |
| 490 EXPECT_EQ(1u, pm->GetAllFrames().size()); | |
| 491 | |
| 492 // ... load an extension frame in the non-extension process | |
| 493 NavigateIframeToURLAndWait(tab, "frame1", kExt1EmptyUrl); | |
| 494 EXPECT_EQ(IfExtensionsIsolated(2, 1), | |
| 495 pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 496 | |
| 497 // ... and take down the tab. The extension process is not part of the tab, | |
| 498 // so it should be kept alive (minus the frames that died). | |
| 499 content::CrashTab(tab); | |
| 500 EXPECT_EQ(1u, pm->GetAllFrames().size()); | |
| 501 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension1->id()).size()); | |
| 502 } | |
| 503 | |
| 160 // Verify correct keepalive count behavior on network request events. | 504 // Verify correct keepalive count behavior on network request events. |
| 161 // Regression test for http://crbug.com/535716. | 505 // Regression test for http://crbug.com/535716. |
| 162 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, KeepaliveOnNetworkRequest) { | 506 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, KeepaliveOnNetworkRequest) { |
| 163 // Load an extension with a lazy background page. | 507 // Load an extension with a lazy background page. |
| 164 scoped_refptr<const Extension> extension = | 508 scoped_refptr<const Extension> extension = |
| 165 LoadExtension(test_data_dir_.AppendASCII("api_test") | 509 LoadExtension(test_data_dir_.AppendASCII("api_test") |
| 166 .AppendASCII("lazy_background_page") | 510 .AppendASCII("lazy_background_page") |
| 167 .AppendASCII("broadcast_event")); | 511 .AppendASCII("broadcast_event")); |
| 168 ASSERT_TRUE(extension.get()); | 512 ASSERT_TRUE(extension.get()); |
| 169 | 513 |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 187 pm->OnNetworkRequestDone(frame_host, 1); | 531 pm->OnNetworkRequestDone(frame_host, 1); |
| 188 EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get())); | 532 EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get())); |
| 189 | 533 |
| 190 // Simulate only a request completion for this ID and ensure it doesn't result | 534 // Simulate only a request completion for this ID and ensure it doesn't result |
| 191 // in keepalive decrement. | 535 // in keepalive decrement. |
| 192 pm->OnNetworkRequestDone(frame_host, 2); | 536 pm->OnNetworkRequestDone(frame_host, 2); |
| 193 EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get())); | 537 EXPECT_EQ(baseline_keepalive, pm->GetLazyKeepaliveCount(extension.get())); |
| 194 } | 538 } |
| 195 | 539 |
| 196 } // namespace extensions | 540 } // namespace extensions |
| OLD | NEW |