Rollback r9835 and r9837: Mac build broken.

r9835: Make browser_shutdown.cc compile on Posix.
Review URL: http://codereview.chromium.org/20384

r9837: Fix the mac build.  Add a stubbed ResourceBundle::CleanupSharedInstance.
Review URL: http://codereview.chromium.org/20387

TBR= jhawkins

Review URL: http://codereview.chromium.org/21385

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9840 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 20 insertions, 37 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 57a1149..73d6356 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -676,6 +676,7 @@ 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 d3d1b98..c1c57ff 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -16,6 +15,8 @@
 #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"
@@ -25,16 +26,8 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/resource_bundle.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
-
+#include "net/dns_global.h"
 
 using base::Time;
 using base::TimeDelta;
@@ -48,7 +41,7 @@ int shutdown_num_processes_slow_;
 
 bool delete_resources_on_shutdown = true;
 
-const char* const kShutdownMsFile = "chrome_shutdown_ms.txt";
+const wchar_t* const kShutdownMsFile = L"chrome_shutdown_ms.txt";
 
 void RegisterPrefs(PrefService* local_state) {
   local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
@@ -85,10 +78,11 @@ void OnShutdownStarting(ShutdownType type) {
   }
 }
 
-FilePath GetShutdownMsPath() {
-  FilePath shutdown_ms_file;
+std::wstring GetShutdownMsPath() {
+  std::wstring shutdown_ms_file;
   PathService::Get(base::DIR_TEMP, &shutdown_ms_file);
-  return shutdown_ms_file.AppendASCII(kShutdownMsFile);
+  file_util::AppendToPath(&shutdown_ms_file, kShutdownMsFile);
+  return shutdown_ms_file;
 }
 
 void Shutdown() {
@@ -158,7 +152,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;
-    FilePath shutdown_ms_file = GetShutdownMsPath();
+    std::wstring shutdown_ms_file = GetShutdownMsPath();
     file_util::WriteFile(shutdown_ms_file, shutdown_ms.c_str(), len);
   }
 
@@ -166,12 +160,12 @@ void Shutdown() {
 }
 
 void ReadLastShutdownInfo() {
-  FilePath shutdown_ms_file = GetShutdownMsPath();
+  std::wstring 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);
-  file_util::Delete(shutdown_ms_file, false);
+  DeleteFile(shutdown_ms_file.c_str());
 
   PrefService* prefs = g_browser_process->local_state();
   ShutdownType type =
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 495ae20..2ee4f1a 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -249,7 +249,6 @@
 		70F87705D5BDD8E76A712336 /* ssl_host_state.cc in Sources */ = {isa = PBXBuildFile; fileRef = F60D7722C1302E1EC789B67A /* ssl_host_state.cc */; };
 		71784BA931A610A94A7FEDC9 /* history_querying_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F50E9D48F7009A6919 /* history_querying_unittest.cc */; };
 		7442556F908264C52BEBFE4D /* starred_url_database_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA090E9D48F7009A6919 /* starred_url_database_unittest.cc */; };
-		7D7BF08CA9978F8782A1E82D /* browser_shutdown.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8460E9D4839009A6919 /* browser_shutdown.cc */; };
 		7F84A3FF0F6102F46E0E5155 /* history_publisher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 269003C4E493789D82B6B0F9 /* history_publisher.cc */; };
 		81E4783DE6F497B9BCC5B9F6 /* bookmark_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3D00CDB6C665E7ED1A1090D7 /* bookmark_model.cc */; };
 		8268477E0F2F69C8009F6555 /* profile_manager_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8E60E9D4839009A6919 /* profile_manager_unittest.cc */; };
@@ -5337,7 +5336,6 @@
 				4D7BF97B0E9D4857009A6919 /* browser_process.cc in Sources */,
 				B61C4EDC0F34EE8300489E0F /* browser_process_impl.cc in Sources */,
 				A76E43A40F29039C009A7E88 /* browser_render_process_host.cc in Sources */,
-				7D7BF08CA9978F8782A1E82D /* browser_shutdown.cc in Sources */,
 				E45075B80F15060C003BE099 /* browser_trial.cc in Sources */,
 				6F0216553E10E43760954EFB /* browser_url_handler.cc in Sources */,
 				E48B68640F2637B6002E47EC /* browser_window_cocoa.mm in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 9b9e4d6..55cbfcc 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -96,6 +96,13 @@ bool ShellIntegration::IsDefaultBrowser() {
 
 //--------------------------------------------------------------------------
 
+namespace browser_shutdown {
+bool delete_resources_on_shutdown = true;
+void ReadLastShutdownInfo()  { NOTIMPLEMENTED(); }
+void Shutdown() { NOTIMPLEMENTED(); }
+void OnShutdownStarting(ShutdownType type) { NOTIMPLEMENTED(); }
+}
+
 // static
 bool FirstRun::IsChromeFirstRun() {
   NOTIMPLEMENTED();
@@ -168,10 +175,6 @@ void InstallJankometer(const CommandLine&) {
   NOTIMPLEMENTED();
 }
 
-void UninstallJankometer() {
-  NOTIMPLEMENTED();
-}
-
 //--------------------------------------------------------------------------
 
 void Browser::Observe(NotificationType type,
@@ -322,10 +325,6 @@ void TabContents::UpdateMaxPageID(int32 page_id) {
 
 //--------------------------------------------------------------------------
 
-void RLZTracker::CleanupRlz() {
-  NOTIMPLEMENTED();
-}
-
 bool RLZTracker::GetAccessPointRlz(AccessPoint point, std::wstring* rlz) {
   NOTIMPLEMENTED();
   return false;
@@ -349,11 +348,7 @@ namespace chrome_browser_net {
 
 void EnableDnsPrefetch(bool) { NOTIMPLEMENTED(); }
 
-void DnsPrefetchList(const std::vector<std::string>& hostnames) {
-  NOTIMPLEMENTED();
-}
-
-void SaveHostNamesForNextStartup(PrefService* local_state) { NOTIMPLEMENTED(); }
+void DnsPrefetchList(const std::vector<std::string>& hostnames) { NOTIMPLEMENTED(); }
 
 }  // namespace chrome_browser_net
 
@@ -410,10 +405,6 @@ std::string ResourceBundle::GetDataResource(int resource_id) {
   return "";
 }
 
-void ResourceBundle::CleanupSharedInstances() {
-  NOTIMPLEMENTED();
-}
-
 #endif
 
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index c9202e0..8555acf 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -828,7 +828,6 @@ class PluginService {
                            const std::string& clsid,
                            const std::wstring& locale,
                            IPC::Message* reply_msg) { NOTIMPLEMENTED(); }
-  void Shutdown() { NOTIMPLEMENTED(); }
  private:
   MessageLoop* main_message_loop_;
   ResourceDispatcherHost* resource_dispatcher_host_;