Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/logging_installer.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 <windows.h>
 
 #include "chrome/installer/util/logging_installer.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 96 matching lines @@
 
 void EndInstallerLogging() {
   logging::CloseLogFile();
 
   installer_logging_ = false;
 }
 
 base::FilePath GetLogFilePath(const installer::MasterPreferences& prefs) {
   std::string path;
   prefs.GetString(installer::master_preferences::kLogFile, &path);
-  if (!path.empty()) {
+  if (!path.empty())
     return base::FilePath(UTF8ToWide(path));
-  }
 
-  std::wstring log_filename = prefs.install_chrome_frame() ?
-      L"chrome_frame_installer.log" : L"chrome_installer.log";
+  static const base::FilePath::CharType kLogFilename[] =
+      FILE_PATH_LITERAL("chrome_installer.log");
 
-  base::FilePath log_path;
-  if (PathService::Get(base::DIR_TEMP, &log_path)) {
-    log_path = log_path.Append(log_filename);
-    return log_path;
-  } else {
-    return base::FilePath(log_filename);
-  }
+  // Fallback to current directory if getting the temp directory fails.
+  base::FilePath tmp_path;
+  ignore_result(PathService::Get(base::DIR_TEMP, &tmp_path));
+  return tmp_path.Append(kLogFilename);
 }
 
 }  // namespace installer