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

chrome/browser/extensions/extension_sorting_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/extension_sorting.h"
 
 #include <map>
 
 #include "chrome/browser/extensions/extension_prefs_unittest.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "sync/api/string_ordinal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace keys = extension_manifest_keys;
 
 class ExtensionSortingTest : public extensions::ExtensionPrefsTest {
  protected:
   ExtensionSorting* extension_sorting() {
     return prefs()->extension_sorting();
   }
 };
 
@@ skipping 595 matching lines @@
  public:
   ExtensionSortingPreinstalledAppsBase() {
     DictionaryValue simple_dict;
     simple_dict.SetString(keys::kVersion, "1.0.0.0");
     simple_dict.SetString(keys::kName, "unused");
     simple_dict.SetString(keys::kApp, "true");
     simple_dict.SetString(keys::kLaunchLocalPath, "fake.html");
 
     std::string error;
     app1_scoped_ = Extension::Create(
-        prefs_.temp_dir().AppendASCII("app1_"), Extension::EXTERNAL_PREF,
+        prefs_.temp_dir().AppendASCII("app1_"), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app1_scoped_.get(),
                                   Extension::ENABLED,
                                   syncer::StringOrdinal());
 
     app2_scoped_ = Extension::Create(
-        prefs_.temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF,
+        prefs_.temp_dir().AppendASCII("app2_"), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app2_scoped_.get(),
                                   Extension::ENABLED,
                                   syncer::StringOrdinal());
 
     app1_ = app1_scoped_.get();
     app2_ = app2_scoped_.get();
   }
   virtual ~ExtensionSortingPreinstalledAppsBase() {}
 
@@ skipping 149 matching lines @@
  protected:
   scoped_refptr<Extension> CreateApp(const std::string& name) {
     DictionaryValue simple_dict;
     simple_dict.SetString(keys::kVersion, "1.0.0.0");
     simple_dict.SetString(keys::kName, name);
     simple_dict.SetString(keys::kApp, "true");
     simple_dict.SetString(keys::kLaunchLocalPath, "fake.html");
 
     std::string errors;
     scoped_refptr<Extension> app = Extension::Create(
-        prefs_.temp_dir().AppendASCII(name), Extension::EXTERNAL_PREF,
+        prefs_.temp_dir().AppendASCII(name), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &errors);
     EXPECT_TRUE(app) << errors;
     EXPECT_TRUE(Extension::IdIsValid(app->id()));
     return app;
   }
 
   void InitDefaultOrdinals() {
     default_page_ordinal_ =
         syncer::StringOrdinal::CreateInitialOrdinal().CreateAfter();
     default_app_launch_ordinal_ =
@@ skipping 126 matching lines @@
     extension_sorting->SetAppLaunchOrdinal(yet_another_app_->id(),
                                            default_app_launch_ordinal_);
   }
 
  private:
   scoped_refptr<Extension> other_app_;
   scoped_refptr<Extension> yet_another_app_;
 };
 TEST_F(ExtensionSortingDefaultOrdinalNoCollision,
        ExtensionSortingDefaultOrdinalNoCollision) {}