Send the index in the canonical list over IPC when using the OOP plugin loader.

content/browser/plugin_loader_posix_unittest.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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 27 matching lines @@
   }
 
   std::vector<webkit::WebPluginInfo>* internal_plugins() {
     return &internal_plugins_;
   }
 
   void RealLoadPluginsInternal() {
     PluginLoaderPosix::LoadPluginsInternal();
   }
 
-  void TestOnPluginLoaded(const webkit::WebPluginInfo& plugin) {
-    OnPluginLoaded(plugin);
+  void TestOnPluginLoaded(size_t index, const webkit::WebPluginInfo& plugin) {
+    OnPluginLoaded(index, plugin);
   }
 
-  void TestOnPluginLoadFailed(const FilePath& path) {
-    OnPluginLoadFailed(path);
+  void TestOnPluginLoadFailed(size_t index, const FilePath& path) {
+    OnPluginLoadFailed(index, path);
   }
 };
 
 void VerifyCallback(int* run_count, const std::vector<webkit::WebPluginInfo>&) {
   ++(*run_count);
 }
 
 class PluginLoaderPosixTest : public testing::Test {
  public:
   PluginLoaderPosixTest()
@@ skipping 44 matching lines @@
   EXPECT_EQ(2u, plugin_loader()->number_of_pending_callbacks());
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunAllPending();
 
   plugin_loader()->canonical_list()->clear();
   plugin_loader()->canonical_list()->push_back(plugin1_.path);
 
   EXPECT_EQ(0, did_callback);
 
-  plugin_loader()->TestOnPluginLoaded(plugin1_);
+  plugin_loader()->TestOnPluginLoaded(0, plugin1_);
   message_loop()->RunAllPending();
 
   EXPECT_EQ(2, did_callback);
   EXPECT_EQ(0u, plugin_loader()->number_of_pending_callbacks());
 }
 
 TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoads) {
   int did_callback = 0;
   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();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<webkit::WebPluginInfo>& plugins(
       plugin_loader()->loaded_plugins());
 
-  plugin_loader()->TestOnPluginLoaded(plugin1_);
+  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(plugin2_);
+  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(plugin3_);
+  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, TwoFailures) {
   int did_callback = 0;
   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();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<webkit::WebPluginInfo>& plugins(
       plugin_loader()->loaded_plugins());
 
-  plugin_loader()->TestOnPluginLoadFailed(plugin1_.path);
+  plugin_loader()->TestOnPluginLoadFailed(0, plugin1_.path);
   EXPECT_EQ(1u, plugin_loader()->next_load_index());
   EXPECT_EQ(0u, plugins.size());
 
   message_loop()->RunAllPending();
   EXPECT_EQ(0, did_callback);
 
-  plugin_loader()->TestOnPluginLoaded(plugin2_);
+  plugin_loader()->TestOnPluginLoaded(1, plugin2_);
   EXPECT_EQ(2u, plugin_loader()->next_load_index());
   EXPECT_EQ(1u, plugins.size());
   EXPECT_EQ(plugin2_.name, plugins[0].name);
 
   message_loop()->RunAllPending();
   EXPECT_EQ(0, did_callback);
 
-  plugin_loader()->TestOnPluginLoadFailed(plugin3_.path);
+  plugin_loader()->TestOnPluginLoadFailed(2, plugin3_.path);
   EXPECT_EQ(1u, plugins.size());
 
   message_loop()->RunAllPending();
   EXPECT_EQ(1, did_callback);
 }
 
 TEST_F(PluginLoaderPosixTest, CrashedProcess) {
   int did_callback = 0;
   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();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<webkit::WebPluginInfo>& plugins(
       plugin_loader()->loaded_plugins());
 
-  plugin_loader()->TestOnPluginLoaded(plugin1_);
+  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);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   plugin_loader()->OnProcessCrashed(42);
   EXPECT_EQ(1u, plugin_loader()->canonical_list()->size());
@@ skipping 17 matching lines @@
   AddThreePlugins();
 
   plugin_loader()->internal_plugins()->clear();
   plugin_loader()->internal_plugins()->push_back(plugin2_);
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<webkit::WebPluginInfo>& plugins(
       plugin_loader()->loaded_plugins());
 
-  plugin_loader()->TestOnPluginLoaded(plugin1_);
+  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);
 
   // Internal plugins can fail to load if they're built-in with manual
   // entrypoint functions.
-  plugin_loader()->TestOnPluginLoadFailed(plugin2_.path);
+  plugin_loader()->TestOnPluginLoadFailed(1, plugin2_.path);
   EXPECT_EQ(2u, plugin_loader()->next_load_index());
   EXPECT_EQ(2u, plugins.size());
   EXPECT_EQ(plugin2_.name, plugins[1].name);
   EXPECT_EQ(0u, plugin_loader()->internal_plugins()->size());
 
   message_loop()->RunAllPending();
   EXPECT_EQ(0, did_callback);
 
-  plugin_loader()->TestOnPluginLoaded(plugin3_);
+  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, AllCrashed) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
@@ skipping 19 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());
 }