Merge 120098 - PluginLoaderPosix: Fix the case where the utility process crashes after all plugin...

content/browser/plugin_loader_posix.cc

 // Copyright (c) 2012 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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ skipping 26 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PluginLoaderPosix, message)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_LoadedPlugin, OnPluginLoaded)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_LoadPluginFailed, OnPluginLoadFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PluginLoaderPosix::OnProcessCrashed(int exit_code) {
-  canonical_list_.erase(canonical_list_.begin(),
-                        canonical_list_.begin() + next_load_index_ + 1);
+  if (next_load_index_ == canonical_list_.size()) {
+    // How this case occurs is unknown. See crbug.com/111935.
+    canonical_list_.clear();
+  } else {
+    canonical_list_.erase(canonical_list_.begin(),
+                          canonical_list_.begin() + next_load_index_ + 1);
+  }
+
   next_load_index_ = 0;
 
   LoadPluginsInternal();
 }
 
 bool PluginLoaderPosix::Send(IPC::Message* message) {
   if (process_host_)
     return process_host_->Send(message);
   return false;
 }
@@ skipping 115 matching lines @@
 
 PluginLoaderPosix::PendingCallback::PendingCallback(
     scoped_refptr<base::MessageLoopProxy> loop,
     const content::PluginService::GetPluginsCallback& cb)
     : target_loop(loop),
       callback(cb) {
 }
 
 PluginLoaderPosix::PendingCallback::~PendingCallback() {
 }