Remove the \servers build output directory and place Chrome Frame parts into the root output folder next to chrome.exe et al.

Also add a more helpful error message when failing to register the Chrome Frame dll.
Review URL: http://codereview.chromium.org/8013001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102780 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome_frame/chrome_launcher_utils.h b/chrome_frame/chrome_launcher_utils.h
index 4f5cdad..699e75e 100644
--- a/chrome_frame/chrome_launcher_utils.h
+++ b/chrome_frame/chrome_launcher_utils.h
@@ -9,6 +9,7 @@
 
 class CommandLine;
 class FilePath;
+template <class C> class scoped_ptr;
 
 namespace chrome_launcher {
 
@@ -19,15 +20,19 @@ extern const wchar_t kLauncherExeBaseName[];
 // flags needed before launching.
 //
 // The command-line may use the Chrome executable directly, or use an in-between
-// process if needed for security/elevation purposes.  You must delete the
-// returned command line.
-CommandLine* CreateLaunchCommandLine();
+// process if needed for security/elevation purposes.
+//
+// On success, returns true and populates command_line, which must be non-NULL,
+// with the launch command line.
+bool CreateLaunchCommandLine(scoped_ptr<CommandLine>* command_line);
 
 // Creates a command line suitable for launching the specified command through
 // Google Update.
 //
-// You must delete the returned command line.
-CommandLine* CreateUpdateCommandLine(const std::wstring& update_command);
+// On success, returns true and populates command_line, which must be non-NULL,
+// with the update command line.
+bool CreateUpdateCommandLine(const std::wstring& update_command,
+                             scoped_ptr<CommandLine>* command_line);
 
 // Returns the full path to the Chrome executable.
 FilePath GetChromeExecutablePath();