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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_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/ui/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace {
 const int kExpectedAppIndex = 1;
 }
 
 class ChromeLauncherControllerPerBrowserTest : public testing::Test {
  protected:
   ChromeLauncherControllerPerBrowserTest()
       : ui_thread_(content::BrowserThread::UI, &loop_),
         file_thread_(content::BrowserThread::FILE, &loop_),
         profile_(new TestingProfile()),
         extension_service_(NULL) {
     DictionaryValue manifest;
     manifest.SetString("name", "launcher controller test extension");
     manifest.SetString("version", "1");
     manifest.SetString("description", "for testing pinned apps");
 
     extensions::TestExtensionSystem* extension_system(
         static_cast<extensions::TestExtensionSystem*>(
             extensions::ExtensionSystem::Get(profile_.get())));
     extension_service_ = extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), FilePath(), false);
 
     std::string error;
-    extension1_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+    extension1_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
                                     Extension::NO_FLAGS,
                                     "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
                                     &error);
-    extension2_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+    extension2_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
                                     Extension::NO_FLAGS,
                                     "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
                                     &error);
     // Fake gmail extension.
-    extension3_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+    extension3_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
                                     Extension::NO_FLAGS,
                                     "pjkljhegncpnkpknbcohdijeoejaedia",
                                     &error);
     // Fake search extension.
-    extension4_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
+    extension4_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
                                     Extension::NO_FLAGS,
                                     "coobgpohoikkiipiblmjeljniedjpjpf",
                                     &error);
   }
 
   virtual void TearDown() OVERRIDE {
     profile_.reset();
     // Execute any pending deletion tasks.
     loop_.RunUntilIdle();
   }
@@ skipping 192 matching lines @@
 
   GetAppLaunchers(&controller, &actual_launchers);
   EXPECT_EQ(expected_launchers, actual_launchers);
 
   // Install |extension2| and verify it shows up between the other two.
   extension_service_->AddExtension(extension2_.get());
   expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id());
   GetAppLaunchers(&controller, &actual_launchers);
   EXPECT_EQ(expected_launchers, actual_launchers);
 }