From f81e4b2470e86a2a67acc8a895265d2cec448353 Mon Sep 17 00:00:00 2001
From: "jhawkins@chromium.org"
 <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 16 Feb 2009 05:28:06 +0000
Subject: Make browser_shudown.cc compile on Posix.  This is r9835 with a fix
 for the mac build. Review URL: http://codereview.chromium.org/20393

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9848 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/browser.scons       |  1 -
 chrome/browser/browser_shutdown.cc | 28 +++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'chrome/browser')

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 73d6356..57a1149 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -676,7 +676,6 @@ if not env.Bit('windows'):
       'bookmarks/bookmark_utils.cc',
       'browser_accessibility.cc',
       'browser_accessibility_manager.cc',
-      'browser_shutdown.cc',
       'chrome_plugin_host.cc',
       'dock_info.cc',
       'dom_ui/dom_ui_contents.cc',
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index c1c57ff..d3d1b98 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/browser_shutdown.h"
 
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/path_service.h"
@@ -15,8 +16,6 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/plugin_process_host.h"
-#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
@@ -26,9 +25,17 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/browser/plugin_service.h"
 #include "net/dns_global.h"
 
+// TODO(port): Get rid of this section and finish porting.
+#if defined(OS_WIN)
+#include "chrome/browser/plugin_process_host.h"
+#include "chrome/browser/plugin_service.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+
+
 using base::Time;
 using base::TimeDelta;
 
@@ -41,7 +48,7 @@ int shutdown_num_processes_slow_;
 
 bool delete_resources_on_shutdown = true;
 
-const wchar_t* const kShutdownMsFile = L"chrome_shutdown_ms.txt";
+const char* const kShutdownMsFile = "chrome_shutdown_ms.txt";
 
 void RegisterPrefs(PrefService* local_state) {
   local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
@@ -78,11 +85,10 @@ void OnShutdownStarting(ShutdownType type) {
   }
 }
 
-std::wstring GetShutdownMsPath() {
-  std::wstring shutdown_ms_file;
+FilePath GetShutdownMsPath() {
+  FilePath shutdown_ms_file;
   PathService::Get(base::DIR_TEMP, &shutdown_ms_file);
-  file_util::AppendToPath(&shutdown_ms_file, kShutdownMsFile);
-  return shutdown_ms_file;
+  return shutdown_ms_file.AppendASCII(kShutdownMsFile);
 }
 
 void Shutdown() {
@@ -152,7 +158,7 @@ void Shutdown() {
     TimeDelta shutdown_delta = Time::Now() - shutdown_started_;
     std::string shutdown_ms = Int64ToString(shutdown_delta.InMilliseconds());
     int len = static_cast<int>(shutdown_ms.length()) + 1;
-    std::wstring shutdown_ms_file = GetShutdownMsPath();
+    FilePath shutdown_ms_file = GetShutdownMsPath();
     file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
   }
 
@@ -160,12 +166,12 @@ void Shutdown() {
 }
 
 void ReadLastShutdownInfo() {
-  std::wstring shutdown_ms_file = GetShutdownMsPath();
+  FilePath shutdown_ms_file = GetShutdownMsPath();
   std::string shutdown_ms_str;
   int64 shutdown_ms = 0;
   if (file_util::ReadFileToString(shutdown_ms_file, &shutdown_ms_str))
     shutdown_ms = StringToInt64(shutdown_ms_str);
-  DeleteFile(shutdown_ms_file.c_str());
+  file_util::Delete(shutdown_ms_file, false);
 
   PrefService* prefs = g_browser_process->local_state();
   ShutdownType type =
-- 
cgit v1.1