Some Chrome Frame cleanup:...

chrome_frame/chrome_launcher.cc

 // Copyright (c) 2009 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.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
   switches::kEnableExperimentalExtensionApis,
   switches::kNoErrorDialogs,
   switches::kNoFirstRun,
   switches::kUserDataDir,
 };
 
 CommandLine* CreateLaunchCommandLine() {
   // TODO(joi) As optimization, could launch Chrome directly when running at
   // medium integrity.  (Requires bringing in code to read SIDs, etc.)
 
-  // The launcher EXE will be in the same directory as the npchrome_tab DLL,
+  // 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/
   // 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(kLauncherExeBaseName);
     if (file_util::PathExists(same_dir_path)) {
       return new CommandLine(same_dir_path);
@@ skipping 68 matching lines @@
     return ERROR_OPEN_FAILED;
   }
 }
 
 // Compile-time check to see that the type CfLaunchChromeProc is correct.
 #ifndef NODEBUG
 namespace {
 chrome_launcher::CfLaunchChromeProc cf_launch_chrome = CfLaunchChrome;
 }  // namespace
 #endif  // NODEBUG