Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/browser/extensions/extension_system.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/manifest.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 ExtensionService;
 class ExtensionProcessManager;
 class Profile;
 
@@ skipping 60 matching lines @@
   // |expected_change| indicates how many extensions should be installed (or
   // disabled, if negative).
   // 1 means you expect a new install, 0 means you expect an upgrade, -1 means
   // you expect a failed upgrade.
   const extensions::Extension* InstallExtension(const FilePath& path,
                                                 int expected_change) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
                                     expected_change);
   }
 
-  // Same as above, but an install source other than Extension::INTERNAL can be
+  // Same as above, but an install source other than Manifest::INTERNAL can be
   // specified.
   const extensions::Extension* InstallExtension(
       const FilePath& path,
       int expected_change,
-      extensions::Extension::Location install_source) {
+      extensions::Manifest::Location install_source) {
     return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE,
                                     expected_change, install_source);
   }
 
   // Installs extension as if it came from the Chrome Webstore.
   const extensions::Extension* InstallExtensionFromWebstore(
       const FilePath& path, int expected_change);
 
   // Same as above but passes an id to CrxInstaller and does not allow a
   // privilege increase.
@@ skipping 117 matching lines @@
                                                         const FilePath& path,
                                                         InstallUIType ui_type,
                                                         int expected_change,
                                                         Browser* browser,
                                                         bool from_webstore);
   const extensions::Extension* InstallOrUpdateExtension(
       const std::string& id,
       const FilePath& path,
       InstallUIType ui_type,
       int expected_change,
-      extensions::Extension::Location install_source);
+      extensions::Manifest::Location install_source);
   const extensions::Extension* InstallOrUpdateExtension(
       const std::string& id,
       const FilePath& path,
       InstallUIType ui_type,
       int expected_change,
-      extensions::Extension::Location install_source,
+      extensions::Manifest::Location install_source,
       Browser* browser,
       bool from_webstore);
 
   bool WaitForExtensionViewsToLoad();
 
   // When waiting for page action count to change, we wait until it reaches this
   // value.
   int target_page_action_count_;
 
   // When waiting for visible page action count to change, we wait until it
   // reaches this value.
   int target_visible_page_action_count_;
 
   // Make the current channel "dev" for the duration of the test.
   extensions::Feature::ScopedCurrentChannel current_channel_;
 
   // 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_