Move application restart and relaunch code out of ExtensionService.

chrome/browser/extensions/unpacked_installer.h

Index: chrome/browser/extensions/unpacked_installer.h
diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h
index d5964c5d4f22b82dbc91752b5f083d692148b85d..9d332c71c901f2b2e4e9a7bae1b37f3cb72f2957 100644
--- a/chrome/browser/extensions/unpacked_installer.h
+++ b/chrome/browser/extensions/unpacked_installer.h
@@ -39,11 +39,14 @@ class UnpackedInstaller
   void Load(const base::FilePath& extension_path);
 
   // Loads the extension from the directory |extension_path|;
-  // for use with command line switch --load-extension=path.
-  // This is equivalent to Load, except that it runs synchronously and
-  // optionally launches the extension once it's loaded.
-  void LoadFromCommandLine(const base::FilePath& extension_path,
-                           bool launch_on_load);
+  // for use with command line switch --load-extension=path or
+  // --load-and-launch-app=path.
+  // This is equivalent to Load, except that it runs reads the extension

[Yoyo Zhou, 2013/05/30 17:29:34]

nit: delete 'runs'

[benwells, 2013/05/31 01:13:04]

Done.

+  // from |extension_path| synchronously.
+  // The return value indicates whether the installation has begun successfully.
+  // The id of the extension being loaded is returned in |extension_id|.
+  bool LoadFromCommandLine(const base::FilePath& extension_path,
+                           std::string* extension_id);
 
   // Allows prompting for plugins to be disabled; intended for testing only.
   bool prompt_for_plugins() { return prompt_for_plugins_; }
@@ -111,9 +114,6 @@ class UnpackedInstaller
   // version.
   bool require_modern_manifest_version_;
 
-  // Whether to launch the extension once it's loaded.
-  bool launch_on_load_;
-
   // Gives access to common methods and data of an extension installer.
   ExtensionInstaller installer_;