Remove the \servers build output directory and place Chrome Frame parts into the root output fold...

chrome_frame/chrome_launcher_utils.cc

Index: chrome_frame/chrome_launcher_utils.cc
===================================================================
--- chrome_frame/chrome_launcher_utils.cc	(revision 102100)
+++ chrome_frame/chrome_launcher_utils.cc	(working copy)
@@ -28,21 +28,16 @@
   FilePath module_path;
   if (PathService::Get(base::FILE_MODULE, &module_path)) {
     FilePath current_dir = module_path.DirName();
-    FilePath same_dir_path = current_dir.Append(
+    FilePath chrome_launcher = current_dir.Append(
         chrome_launcher::kLauncherExeBaseName);
-    if (file_util::PathExists(same_dir_path)) {
-      return new CommandLine(same_dir_path);
-    } else {
-      FilePath servers_path = current_dir.Append(L"servers").Append(
-          chrome_launcher::kLauncherExeBaseName);
-      DCHECK(file_util::PathExists(servers_path)) <<
-          "What module is this? It's not in 'servers' or main output dir.";
-      return new CommandLine(servers_path);
+    if (file_util::PathExists(chrome_launcher)) {
+      return new CommandLine(chrome_launcher);
     }
-  } else {
-    NOTREACHED();
-    return NULL;
   }
+
+  NOTREACHED() << "Could not find " << chrome_launcher::kLauncherExeBaseName
+               << " in output dir.";
+  return NULL;

[grt (UTC plus 2), 2011/09/23 13:40:05]

this NULL will call callers to explode in release mode since the contract for
this and CreateLaunchCommandLine doesn't indicate that NULL is a valid response.
 would you mind refactoring this and the related functions and their callers so
that this doesn't happen?  i'll do (more) cartwheels down the hall if you take
my scoped_ptr suggestion into account, too.

[robertshield, 2011/09/23 20:31:13]

Very well, I expect better cartwheels though.

 }
 
 }  // namespace