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

chrome_frame/chrome_launcher_utils.cc

 // Copyright (c) 2011 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.
 
 #include "chrome_frame/chrome_launcher_utils.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/chrome_frame_automation.h"
 
 namespace {
 
 const char kUpdateCommandFlag[] = "--update-cmd";
 
 CommandLine* CreateChromeLauncherCommandLine() {

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

boy do i wish this was:
void CreateChromeLauncherCommandLine(scoped_ptr<CommandLine>* command_line)
but i'm not going to make you do that

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

Yes, yes you are.

   // The launcher EXE will be in the same directory as the Chrome Frame DLL,
   // so create a full path to it based on this assumption.  Since our unit
   // tests also use this function, and live in the directory above, we test
   // existence of the file and try the path that includes the /servers/

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

please update comment

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

Done.

   // directory if needed.
   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
 
 namespace chrome_launcher {
 
 const wchar_t kLauncherExeBaseName[] = L"chrome_launcher.exe";
 
 CommandLine* CreateUpdateCommandLine(const std::wstring& update_command) {
   CommandLine* command_line = CreateChromeLauncherCommandLine();
@@ skipping 26 matching lines @@
   // instead.
   if (!file_util::PathExists(cur_path)) {
     PathService::Get(base::DIR_MODULE, &cur_path);
     cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName);
   }
 
   return cur_path;
 }
 
 }  // namespace chrome_launcher