Revert 170660

chrome/browser/extensions/extension_browsertest.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
 class ExtensionProcessManager;
-class ShellWindow;
 
 // Base class for extension browser tests. Provides utilities for loading,
 // unloading, and installing extensions.
 class ExtensionBrowserTest : virtual public InProcessBrowserTest,
                              public content::NotificationObserver {
  protected:
   // Flags used to configure how the tests are run.
   enum Flags {
     kFlagNone = 0,
 
@@ skipping 127 matching lines @@
   // happened.
   bool WaitForExtensionLoadError();
 
   // Wait for the specified extension to crash. Returns true if it really
   // crashed.
   bool WaitForExtensionCrash(const std::string& extension_id);
 
   // Wait for the crx installer to be done. Returns true if it really is done.
   bool WaitForCrxInstallerDone();
 
-  // Closes |window| and waits until it's gone.
-  void CloseShellWindow(ShellWindow* window);
-
-  // Close any Shell Windows and wait for the app's background page to be
-  // unloaded.
-  void CloseShellWindowsAndWaitForAppToExit();
-
   // Simulates a page calling window.open on an URL and waits for the
   // navigation.
   void OpenWindow(content::WebContents* contents,
                   const GURL& url,
                   bool newtab_process_should_equal_opener,
                   content::WebContents** newtab_result);
 
   // Simulates a page navigating itself to an URL and waits for the
   // navigation.
   void NavigateInRenderer(content::WebContents* contents, const GURL& url);
@@ skipping 74 matching lines @@
   // Disable external install UI.
   extensions::FeatureSwitch::ScopedOverride
       override_prompt_for_external_extensions_;
 
   // Disable the sideload wipeout UI.
   extensions::FeatureSwitch::ScopedOverride
       override_sideload_wipeout_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_