Cleanup: Make ExtensionService::OnExtensionInstalled take a bitmask instead of

chrome/browser/extensions/crx_installer.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_installer.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "extensions/browser/install_flag.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "sync/api/string_ordinal.h"
 
 class ExtensionService;
 class ExtensionServiceTest;
 class SkBitmap;
 struct WebApplicationInfo;
 
 namespace base {
@@ skipping 142 matching lines @@
   }
 
   void set_page_ordinal(const syncer::StringOrdinal& page_ordinal) {
     page_ordinal_ = page_ordinal;
   }
 
   void set_error_on_unsupported_requirements(bool val) {
     error_on_unsupported_requirements_ = val;
   }
 
-  void set_install_wait_for_idle(bool val) {
-    install_wait_for_idle_ = val;
+  void set_install_immediately(bool val) {
+    if (val)
+      install_flags_ |= kInstallFlagInstallImmediately;
+    else
+      install_flags_ &= ~kInstallFlagInstallImmediately;
   }
 
   void set_is_ephemeral(bool val) {
-    is_ephemeral_ = val;
+    if (val)
+      install_flags_ |= kInstallFlagIsEphemeral;
+    else
+      install_flags_ &= ~kInstallFlagIsEphemeral;
   }
 
   bool did_handle_successfully() const { return did_handle_successfully_; }
 
   Profile* profile() { return installer_.profile(); }
 
   const Extension* extension() { return installer_.extension().get(); }
 
  private:
   friend class ::ExtensionServiceTest;
@@ skipping 185 matching lines @@
   // initiating the installation can be removed. This is different than whether
   // there was an error; if there was an error that rejects installation we
   // still consider the installation 'handled'.
   bool did_handle_successfully_;
 
   // Whether we should produce an error if the manifest declares requirements
   // that are not met. If false and there is an unmet requirement, the install
   // will continue but the extension will be distabled.
   bool error_on_unsupported_requirements_;
 
-  bool has_requirement_errors_;
-
-  extensions::BlacklistState blacklist_state_;
-
-  bool install_wait_for_idle_;
-
   // Sequenced task runner where file I/O operations will be performed.
   scoped_refptr<base::SequencedTaskRunner> installer_task_runner_;
 
   // Used to show the install dialog.
   ExtensionInstallPrompt::ShowDialogCallback show_dialog_callback_;
 
   // Whether the update is initiated by the user from the extension settings
   // page.
   bool update_from_settings_page_;
 
-  // True if an ephemeral app is being installed.
-  bool is_ephemeral_;
+  // The flags for ExtensionService::OnExtensionInstalled.
+  int install_flags_;
 
   // Gives access to common methods and data of an extension installer.
   ExtensionInstaller installer_;
 
   DISALLOW_COPY_AND_ASSIGN(CrxInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CRX_INSTALLER_H_