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

2 files changed, 8 insertions, 18 deletions

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_;