Improve settings override bubble to indicate policy installed extensions

chrome/browser/extensions/extension_service_test_with_install.h

 // Copyright 2015 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_SERVICE_TEST_WITH_INSTALL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 34 matching lines @@
   enum InstallState {
     INSTALL_FAILED,
     INSTALL_UPDATED,
     INSTALL_NEW,
     INSTALL_WITHOUT_LOAD,
   };
 
   const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
                                      const base::FilePath& pem_path,
                                      InstallState install_state,
-                                     int creation_flags);
+                                     int creation_flags,
+                                     Manifest::Location install_location);
   const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
                                      const base::FilePath& pem_path,
                                      InstallState install_state);
   const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
                                      InstallState install_state);
-
+  const Extension* PackAndInstallCRX(const base::FilePath& dir_path,
+                                     Manifest::Location install_location,
+                                     InstallState install_state);
   const Extension* InstallCRX(const base::FilePath& path,
                               InstallState install_state,
                               int creation_flags,
                               const std::string& expected_old_name);
   const Extension* InstallCRX(const base::FilePath& path,
+                              Manifest::Location install_location,
+                              InstallState install_state,
+                              int creation_flags);
+  const Extension* InstallCRX(const base::FilePath& path,
                               InstallState install_state,
                               int creation_flags);
   const Extension* InstallCRX(const base::FilePath& path,
                               InstallState install_state);
   const Extension* InstallCRXFromWebStore(const base::FilePath& path,
                                           InstallState install_state);
-  const Extension* InstallCRXWithLocation(const base::FilePath& crx_path,
-                                          Manifest::Location install_location,
-                                          InstallState install_state);
 
   // Verifies the result of a CRX installation. Used by InstallCRX. Set the
   // |install_state| to INSTALL_FAILED if the installation is expected to fail.
   // Returns an Extension pointer if the install succeeded, null otherwise.
   const Extension* VerifyCrxInstall(const base::FilePath& path,
                                     InstallState install_state);
 
   // Verifies the result of a CRX installation. Used by InstallCRX. Set the
   // |install_state| to INSTALL_FAILED if the installation is expected to fail.
   // If |install_state| is INSTALL_UPDATED, and |expected_old_name| is
@@ skipping 42 matching lines @@
 
   // TODO(treib,devlin): Make these private and add accessors as needed.
   extensions::ExtensionList loaded_;
   const Extension* installed_;
   bool was_update_;
   std::string old_name_;
   std::string unloaded_id_;
   UnloadedExtensionInfo::Reason unloaded_reason_;
 
  private:
-  void InstallCRXInternal(const base::FilePath& crx_path, int creation_flags);
+  void InstallCRXInternal(const base::FilePath& crx_path,
+                          Manifest::Location install_location,
+                          InstallState install_state,
+                          int creation_flags);
 
   size_t expected_extensions_count_;
 
   FeatureSwitch::ScopedOverride override_external_install_prompt_;
 
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       registry_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionServiceTestWithInstall);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_TEST_WITH_INSTALL_H_