| Index: content/browser/plugin_loader_posix_unittest.cc
|
| diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc
|
| index 85e66adc10f2efaf02164b0003dc2589eb918b0f..dce612a85c17b8ab0753ce4007db36363edbc65f 100644
|
| --- a/content/browser/plugin_loader_posix_unittest.cc
|
| +++ b/content/browser/plugin_loader_posix_unittest.cc
|
| @@ -170,6 +170,49 @@ TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoads) {
|
| 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 =
|
|
|