Index: chrome/browser/extensions/extension_process_manager_browsertest.cc |
diff --git a/chrome/browser/extensions/extension_process_manager_browsertest.cc b/chrome/browser/extensions/extension_process_manager_browsertest.cc |
deleted file mode 100644 |
index b4de778995186d807c54f5065f8bbc7d9c5d2665..0000000000000000000000000000000000000000 |
--- a/chrome/browser/extensions/extension_process_manager_browsertest.cc |
+++ /dev/null |
@@ -1,106 +0,0 @@ |
-// Copyright 2013 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
- |
-#include "chrome/browser/extensions/extension_process_manager.h" |
- |
-#include "chrome/browser/extensions/browser_action_test_util.h" |
-#include "chrome/browser/extensions/extension_browsertest.h" |
-#include "chrome/browser/extensions/extension_service.h" |
-#include "chrome/browser/extensions/extension_system.h" |
-#include "chrome/test/base/in_process_browser_test.h" |
-#include "content/public/browser/notification_service.h" |
-#include "content/public/test/test_utils.h" |
- |
-using extensions::Extension; |
-using extensions::ExtensionSystem; |
- |
-// Exists as a browser test because ExtensionHosts are hard to create without |
-// a real browser. |
-typedef ExtensionBrowserTest ExtensionProcessManagerBrowserTest; |
- |
-// Test that basic extension loading creates the appropriate ExtensionHosts |
-// and background pages. |
-IN_PROC_BROWSER_TEST_F(ExtensionProcessManagerBrowserTest, |
- ExtensionHostCreation) { |
- ExtensionProcessManager* pm = |
- ExtensionSystem::Get(profile())->process_manager(); |
- |
- // We start with no background hosts. |
- ASSERT_EQ(0u, pm->background_hosts().size()); |
- ASSERT_EQ(0u, pm->GetAllViews().size()); |
- |
- // Load an extension with a background page. |
- scoped_refptr<const Extension> extension = |
- LoadExtension(test_data_dir_.AppendASCII("api_test") |
- .AppendASCII("browser_action") |
- .AppendASCII("none")); |
- ASSERT_TRUE(extension.get()); |
- |
- // Process manager gains a background host. |
- EXPECT_EQ(1u, pm->background_hosts().size()); |
- EXPECT_EQ(1u, pm->GetAllViews().size()); |
- EXPECT_TRUE(pm->GetBackgroundHostForExtension(extension->id())); |
- EXPECT_TRUE(pm->GetSiteInstanceForURL(extension->url())); |
- EXPECT_EQ(1u, pm->GetRenderViewHostsForExtension(extension->id()).size()); |
- EXPECT_FALSE(pm->IsBackgroundHostClosing(extension->id())); |
- EXPECT_EQ(0, pm->GetLazyKeepaliveCount(extension.get())); |
- |
- // Unload the extension. |
- UnloadExtension(extension->id()); |
- |
- // Background host disappears. |
- EXPECT_EQ(0u, pm->background_hosts().size()); |
- EXPECT_EQ(0u, pm->GetAllViews().size()); |
- EXPECT_FALSE(pm->GetBackgroundHostForExtension(extension->id())); |
- EXPECT_TRUE(pm->GetSiteInstanceForURL(extension->url())); |
- EXPECT_EQ(0u, pm->GetRenderViewHostsForExtension(extension->id()).size()); |
- EXPECT_FALSE(pm->IsBackgroundHostClosing(extension->id())); |
- EXPECT_EQ(0, pm->GetLazyKeepaliveCount(extension.get())); |
-} |
- |
-// Test that loading an extension with a browser action does not create a |
-// background page and that clicking on the action creates the appropriate |
-// ExtensionHost. |
-// Disabled due to flake, see http://crbug.com/315242 |
-IN_PROC_BROWSER_TEST_F(ExtensionProcessManagerBrowserTest, |
- DISABLED_PopupHostCreation) { |
- ExtensionProcessManager* pm = |
- ExtensionSystem::Get(profile())->process_manager(); |
- |
- // Load an extension with the ability to open a popup but no background |
- // page. |
- scoped_refptr<const Extension> popup = |
- LoadExtension(test_data_dir_.AppendASCII("api_test") |
- .AppendASCII("browser_action") |
- .AppendASCII("popup")); |
- ASSERT_TRUE(popup); |
- |
- // No background host was added. |
- EXPECT_EQ(0u, pm->background_hosts().size()); |
- EXPECT_EQ(0u, pm->GetAllViews().size()); |
- EXPECT_FALSE(pm->GetBackgroundHostForExtension(popup->id())); |
- EXPECT_EQ(0u, pm->GetRenderViewHostsForExtension(popup->id()).size()); |
- EXPECT_TRUE(pm->GetSiteInstanceForURL(popup->url())); |
- EXPECT_FALSE(pm->IsBackgroundHostClosing(popup->id())); |
- EXPECT_EQ(0, pm->GetLazyKeepaliveCount(popup.get())); |
- |
- // Simulate clicking on the action to open a popup. |
- BrowserActionTestUtil test_util(browser()); |
- content::WindowedNotificationObserver frame_observer( |
- content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME, |
- content::NotificationService::AllSources()); |
- // Open popup in the first extension. |
- test_util.Press(0); |
- frame_observer.Wait(); |
- ASSERT_TRUE(test_util.HasPopup()); |
- |
- // We now have a view, but still no background hosts. |
- EXPECT_EQ(0u, pm->background_hosts().size()); |
- EXPECT_EQ(1u, pm->GetAllViews().size()); |
- EXPECT_FALSE(pm->GetBackgroundHostForExtension(popup->id())); |
- EXPECT_EQ(1u, pm->GetRenderViewHostsForExtension(popup->id()).size()); |
- EXPECT_TRUE(pm->GetSiteInstanceForURL(popup->url())); |
- EXPECT_FALSE(pm->IsBackgroundHostClosing(popup->id())); |
- EXPECT_EQ(0, pm->GetLazyKeepaliveCount(popup.get())); |
-} |