Add an installType property to the management API

chrome/browser/extensions/api/management/management_apitest.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 <map>
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/test_management_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/manifest.h"
 #include "content/public/test/test_utils.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace {
 
 // Find a browser other than |browser|.
 Browser* FindOtherBrowser(Browser* browser) {
   Browser* found = NULL;
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
     if (*it == browser)
       continue;
     found = *it;
   }
 
   return found;
 }
 
 }  // namespace
 
 class ExtensionManagementApiTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
   }
 
-  virtual void InstallExtensions() {
+  virtual void LoadExtensions() {
     FilePath basedir = test_data_dir_.AppendASCII("management");
 
     // Load 4 enabled items.
-    InstallNamedExtension(basedir, "enabled_extension");
-    InstallNamedExtension(basedir, "enabled_app");
-    InstallNamedExtension(basedir, "description");
-    InstallNamedExtension(basedir, "permissions");
+    LoadNamedExtension(basedir, "enabled_extension");
+    LoadNamedExtension(basedir, "enabled_app");
+    LoadNamedExtension(basedir, "description");
+    LoadNamedExtension(basedir, "permissions");
 
     // Load 2 disabled items.
-    InstallNamedExtension(basedir, "disabled_extension");
+    LoadNamedExtension(basedir, "disabled_extension");
     DisableExtension(extension_ids_["disabled_extension"]);
-    InstallNamedExtension(basedir, "disabled_app");
+    LoadNamedExtension(basedir, "disabled_app");
     DisableExtension(extension_ids_["disabled_app"]);
   }
 
   // Load an app, and wait for a message from app "management/launch_on_install"
   // indicating that the new app has been launched.
   void LoadAndWaitForLaunch(const std::string& app_path,
                             std::string* out_app_id) {
     ExtensionTestMessageListener launched_app("launched app", false);
     ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(app_path)));
 
     if (out_app_id)
       *out_app_id = last_loaded_extension_id_;
 
     ASSERT_TRUE(launched_app.WaitUntilSatisfied());
   }
 
  protected:
-  void InstallNamedExtension(FilePath basedir, std::string name) {
-    const Extension* extension = LoadExtension(basedir.AppendASCII(name));
+  void LoadNamedExtension(const FilePath& path,
+                          const std::string& name) {
+    const Extension* extension = LoadExtension(path.AppendASCII(name));
     ASSERT_TRUE(extension);
     extension_ids_[name] = extension->id();
   }
 
-  // Maps installed extension names to their IDs..
+  void InstallNamedExtension(const FilePath& path,
+                             const std::string& name,
+                             Extension::Location install_source) {
+    const Extension* extension = InstallExtension(path.AppendASCII(name), 1,
+                                                  install_source);
+    ASSERT_TRUE(extension);
+    extension_ids_[name] = extension->id();
+  }
+
+  // Maps installed extension names to their IDs.
   std::map<std::string, std::string> extension_ids_;
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, Basics) {
-  InstallExtensions();
+  LoadExtensions();
+
+  FilePath basedir = test_data_dir_.AppendASCII("management");
+  InstallNamedExtension(basedir, "internal_extension", Extension::INTERNAL);
+  InstallNamedExtension(basedir, "external_extension",
+                        Extension::EXTERNAL_PREF);
+  InstallNamedExtension(basedir, "admin_extension",
+                        Extension::EXTERNAL_POLICY_DOWNLOAD);
+
   ASSERT_TRUE(RunExtensionSubtest("management/test", "basics.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, Uninstall) {
-  InstallExtensions();
+  LoadExtensions();
   ASSERT_TRUE(RunExtensionSubtest("management/test", "uninstall.html"));
 }
 
 // Tests actions on extensions when no management policy is in place.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyAllowed) {
-  InstallExtensions();
+  LoadExtensions();
   ExtensionService* service = browser()->profile()->GetExtensionService();
   EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
                                         false));
 
   // Ensure that all actions are allowed.
   extensions::ExtensionSystem::Get(
       browser()->profile())->management_policy()->UnregisterAllProviders();
 
   ASSERT_TRUE(RunExtensionSubtest("management/management_policy",
                                   "allowed.html"));
   // The last thing the test does is uninstall the "enabled_extension".
   EXPECT_FALSE(service->GetExtensionById(extension_ids_["enabled_extension"],
                                          true));
 }
 
 // Tests actions on extensions when management policy prohibits those actions.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, ManagementPolicyProhibited) {
-  InstallExtensions();
+  LoadExtensions();
   ExtensionService* service = browser()->profile()->GetExtensionService();
   EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
                                         false));
 
   // Prohibit status changes.
   extensions::ManagementPolicy* policy = extensions::ExtensionSystem::Get(
       browser()->profile())->management_policy();
   policy->UnregisterAllProviders();
   extensions::TestManagementPolicyProvider provider(
     extensions::TestManagementPolicyProvider::PROHIBIT_MODIFY_STATUS);
@@ skipping 104 matching lines @@
   ASSERT_EQ(2, browser()->tab_count());
 #else
   // Find the app's browser.  Opening in a new window will create
   // a new browser.
   ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
   Browser* app_browser = FindOtherBrowser(browser());
   ASSERT_TRUE(app_browser->is_app());
   ASSERT_FALSE(app_browser->is_type_panel());
 #endif
 }