Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

chrome/browser/browser_shutdown.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 "chrome/browser/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "content/browser/browser_thread.h"
@@ skipping 101 matching lines @@
 
   // WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough
   // time to get here. If you have something that *must* happen on end session,
   // consider putting it in BrowserProcessImpl::EndSession.
   PrefService* prefs = g_browser_process->local_state();
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   PrefService* user_prefs = profile_manager->GetDefaultProfile()->GetPrefs();
 
   chrome_browser_net::SavePredictorStateForNextStartupAndTrim(user_prefs);
 
-  PluginUpdater::GetInstance()->Shutdown();
-
   MetricsService* metrics = g_browser_process->metrics_service();
   if (metrics)
     metrics->RecordCompletedSessionEnd();
 
   if (shutdown_type_ > NOT_VALID && shutdown_num_processes_ > 0) {
     // Record the shutdown info so that we can put it into a histogram at next
     // startup.
     prefs->SetInteger(prefs::kShutdownType, shutdown_type_);
     prefs->SetInteger(prefs::kShutdownNumProcesses, shutdown_num_processes_);
     prefs->SetInteger(prefs::kShutdownNumProcessesSlow,
@@ skipping 165 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown