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

chrome/browser/extensions/default_apps_unittest.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 "chrome/browser/extensions/external_pref_loader.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/default_apps.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 26 matching lines @@
 };
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 // Chrome OS has different way of installing default apps.
 // Android does not currently support installing apps via Chrome.
 TEST_F(DefaultAppsTest, Install) {
   scoped_ptr<TestingProfile> profile(new TestingProfile());
   extensions::ExternalLoader* loader = new MockExternalLoader();
 
 
-  Provider provider(profile.get(), NULL, loader, Extension::INTERNAL,
-                    Extension::INTERNAL, Extension::NO_FLAGS);
+  Provider provider(profile.get(), NULL, loader, Manifest::INTERNAL,
+                    Manifest::INTERNAL, Extension::NO_FLAGS);
 
   // The default apps should be installed if kDefaultAppsInstallState
   // is unknown.
   EXPECT_TRUE(provider.ShouldInstallInProfile());
   int state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
   EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
 
   // The default apps should only be installed once.
   EXPECT_FALSE(provider.ShouldInstallInProfile());
   state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
@@ skipping 14 matching lines @@
   state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
   EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
 
   class DefaultTestingProfile : public TestingProfile {
     virtual  bool WasCreatedByVersionOrLater(
         const std::string& version) OVERRIDE {
       return false;
     }
   };
   profile.reset(new DefaultTestingProfile);
-  Provider provider2(profile.get(), NULL, loader, Extension::INTERNAL,
-                     Extension::INTERNAL, Extension::NO_FLAGS);
+  Provider provider2(profile.get(), NULL, loader, Manifest::INTERNAL,
+                     Manifest::INTERNAL, Extension::NO_FLAGS);
   // The old default apps with kProvideLegacyDefaultApps should be migrated
   // even if the profile version is older than Chrome version.
   profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
       default_apps::kProvideLegacyDefaultApps);
   EXPECT_TRUE(provider2.ShouldInstallInProfile());
   state = profile->GetPrefs()->GetInteger(prefs::kDefaultAppsInstallState);
   EXPECT_TRUE(state == default_apps::kAlreadyInstalledDefaultApps);
 }
 #endif