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

content/browser/plugin_loader_posix_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/at_exit.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 151 matching lines @@
   EXPECT_EQ(0, did_callback);
 
   plugin_loader()->TestOnPluginLoaded(2, plugin3_);
   EXPECT_EQ(3u, plugins.size());
   EXPECT_EQ(plugin3_.name, plugins[2].name);
 
   message_loop()->RunAllPending();
   EXPECT_EQ(1, did_callback);
 }
 
+TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoadsThenCrash) {
+  int did_callback = 0;
+  content::PluginService::GetPluginsCallback callback =
+      base::Bind(&VerifyCallback, base::Unretained(&did_callback));
+
+  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
+
+  EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(2);
+  message_loop()->RunAllPending();
+
+  AddThreePlugins();
+
+  EXPECT_EQ(0u, plugin_loader()->next_load_index());
+
+  const std::vector<webkit::WebPluginInfo>& plugins(
+      plugin_loader()->loaded_plugins());
+
+  plugin_loader()->TestOnPluginLoaded(0, plugin1_);
+  EXPECT_EQ(1u, plugin_loader()->next_load_index());
+  EXPECT_EQ(1u, plugins.size());
+  EXPECT_EQ(plugin1_.name, plugins[0].name);
+
+  message_loop()->RunAllPending();
+  EXPECT_EQ(0, did_callback);
+
+  plugin_loader()->TestOnPluginLoaded(1, plugin2_);
+  EXPECT_EQ(2u, plugin_loader()->next_load_index());
+  EXPECT_EQ(2u, plugins.size());
+  EXPECT_EQ(plugin2_.name, plugins[1].name);
+
+  message_loop()->RunAllPending();
+  EXPECT_EQ(0, did_callback);
+
+  plugin_loader()->TestOnPluginLoaded(2, plugin3_);
+  EXPECT_EQ(3u, plugins.size());
+  EXPECT_EQ(plugin3_.name, plugins[2].name);
+
+  message_loop()->RunAllPending();
+  EXPECT_EQ(1, did_callback);
+
+  plugin_loader()->OnProcessCrashed(42);
+}
+
 TEST_F(PluginLoaderPosixTest, TwoFailures) {
   int did_callback = 0;
   content::PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
   plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunAllPending();
 
@@ skipping 133 matching lines @@
                           &MockPluginLoaderPosix::RealLoadPluginsInternal));
   plugin_loader()->OnProcessCrashed(42);
   plugin_loader()->OnProcessCrashed(42);
   plugin_loader()->OnProcessCrashed(42);
 
   message_loop()->RunAllPending();
   EXPECT_EQ(1, did_callback);
 
   EXPECT_EQ(0u, plugin_loader()->loaded_plugins().size());
 }