Revert of Fix event page process cleanup when running in --isolate-extensions mode.

chrome/browser/extensions/lazy_background_page_apitest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 19 matching lines @@
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
-#include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
@@ skipping 47 matching lines @@
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
     // Set shorter delays to prevent test timeouts.
     ProcessManager::SetEventPageIdleTimeForTesting(1);
     ProcessManager::SetEventPageSuspendingTimeForTesting(1);
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     // Disable background network activity as it can suddenly bring the Lazy
     // Background Page alive.
-    command_line->AppendSwitch(::switches::kDisableBackgroundNetworking);
-    command_line->AppendSwitch(::switches::kNoProxyServer);
+    command_line->AppendSwitch(switches::kDisableBackgroundNetworking);
+    command_line->AppendSwitch(switches::kNoProxyServer);
   }
 
   // Loads the extension, which temporarily starts the lazy background page
   // to dispatch the onInstalled event. We wait until it shuts down again.
   const Extension* LoadExtensionAndWait(const std::string& test_name) {
     LazyBackgroundObserver page_complete;
     base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page").
         AppendASCII(test_name);
     const Extension* extension = LoadExtension(extdir);
     if (extension)
@@ skipping 533 matching lines @@
 // Tests that the lazy background page will be unloaded if the onSuspend event
 // handler calls an API function such as chrome.storage.local.set().
 // See: http://crbug.com/296834
 IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, OnSuspendUseStorageApi) {
   EXPECT_TRUE(LoadExtensionAndWait("on_suspend"));
 }
 
 // TODO: background page with timer.
 // TODO: background page that interacts with popup.
 
-// Test class to allow test cases to run in --isolate-extensions mode.
-class LazyBackgroundPageIsolatedExtensionsApiTest
-    : public LazyBackgroundPageApiTest {
- public:
-  LazyBackgroundPageIsolatedExtensionsApiTest() {}
-  ~LazyBackgroundPageIsolatedExtensionsApiTest() override {}
-
-  void SetUpInProcessBrowserTestFixture() override {
-    LazyBackgroundPageApiTest::SetUpInProcessBrowserTestFixture();
-
-    // This is needed to allow example.com to actually resolve and load in
-    // tests.
-    host_resolver()->AddRule("*", "127.0.0.1");
-  }
-
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    LazyBackgroundPageApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kIsolateExtensions);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LazyBackgroundPageIsolatedExtensionsApiTest);
-};
-
-// Ensure that the events page of an extension is properly torn down and the
-// process does not linger around when running in --isolate-extensions mode.
-// See https://crbug.com/612668.
-IN_PROC_BROWSER_TEST_F(LazyBackgroundPageIsolatedExtensionsApiTest,
-                       EventProcessCleanup) {
-  ASSERT_TRUE(LoadExtensionAndWait("event_page_with_web_iframe"));
-
-  // Lazy Background Page doesn't exist anymore.
-  EXPECT_FALSE(IsBackgroundPageAlive(last_loaded_extension_id()));
-}
-
 }  // namespace extensions