Move application restart and relaunch code out of ExtensionService.

chrome/browser/extensions/unpacked_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_UNPACKED_INSTALLER_H_
 #define CHROME_BROWSER_EXTENSIONS_UNPACKED_INSTALLER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
   static scoped_refptr<UnpackedInstaller> Create(
       ExtensionService* extension_service);
 
   // Loads the extension from the directory |extension_path|, which is
   // the top directory of a specific extension where its manifest file lives.
   // Errors are reported through ExtensionErrorReporter. On success,
   // ExtensionService::AddExtension() is called.
   void Load(const base::FilePath& extension_path);
 
   // Loads the extension from the directory |extension_path|;
-  // for use with command line switch --load-extension=path.
+  // for use with command line switch --load-extension=path or
+  // --load-and-launch-app.
   // This is equivalent to Load, except that it runs synchronously and
   // optionally launches the extension once it's loaded.

[koz (OOO until 15th September), 2013/05/30 00:22:22]

This function no longer optionally launches the extension once it's loaded so
this part of the comment is no longer valid. Also, it says that it runs
synchronously, but the new call site seems to behave as if it is asynchronous,
ie:

std::string extension_id;
LoadFromCommandLine(..., &extension_id);
ScheduleLaunchOnLoad(extension_id);  // Assumes extension_id not loaded yet.

It seems that it synchronously loads the extension off the disk, but
asynchronously "loads" the extension. Maybe just amend this comment by saying

"This is equivalent to Load, except that it reads the extension from
|extension_path| synchronously."

[benwells, 2013/05/30 01:47:43]

Done.

-  void LoadFromCommandLine(const base::FilePath& extension_path,
-                           bool launch_on_load);
+  // 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_; }
   void set_prompt_for_plugins(bool val) { prompt_for_plugins_ = val; }
 
   // Allows overriding of whether modern manifest versions are required;
   // intended for testing.
   bool require_modern_manifest_version() const {
     return require_modern_manifest_version_;
   }
@@ skipping 47 matching lines @@
   base::FilePath extension_path_;
 
   // If true and the extension contains plugins, we prompt the user before
   // loading.
   bool prompt_for_plugins_;
 
   // Whether to require the extension installed to have a modern manifest
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(UnpackedInstaller);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_UNPACKED_INSTALLER_H_