Restart plugin loading only if the plugin list has actually become stale.

content/browser/plugin_loader_posix_unittest.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/at_exit.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/common/plugin_list.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace content {
 
 class MockPluginLoaderPosix : public PluginLoaderPosix {
  public:
   MOCK_METHOD0(LoadPluginsInternal, void(void));
@@ skipping 65 matching lines @@
     plugin_loader_->canonical_list()->push_back(plugin2_.path);
     plugin_loader_->canonical_list()->push_back(plugin3_.path);
   }
 
   // Data used for testing.
   WebPluginInfo plugin1_;
   WebPluginInfo plugin2_;
   WebPluginInfo plugin3_;
 
  private:
-  base::ShadowingAtExitManager at_exit_manager_;  // Destroys PluginService.
+  // Destroys PluginService and PluginList.
+  base::ShadowingAtExitManager at_exit_manager_;
 
   base::MessageLoopForIO message_loop_;
   BrowserThreadImpl file_thread_;
   BrowserThreadImpl io_thread_;
 
   scoped_refptr<MockPluginLoaderPosix> plugin_loader_;
 };
 
 TEST_F(PluginLoaderPosixTest, QueueRequests) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
-  EXPECT_EQ(0u, plugin_loader()->number_of_pending_callbacks());
-  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
-  EXPECT_EQ(1u, plugin_loader()->number_of_pending_callbacks());
+  plugin_loader()->GetPlugins(callback);
+  plugin_loader()->GetPlugins(callback);
 
-  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
-  EXPECT_EQ(2u, plugin_loader()->number_of_pending_callbacks());
-
-  EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(2);
+  EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
 
   EXPECT_EQ(0, did_callback);
 
   plugin_loader()->canonical_list()->clear();
   plugin_loader()->canonical_list()->push_back(plugin1_.path);
   plugin_loader()->TestOnPluginLoaded(0, plugin1_);
   message_loop()->RunUntilIdle();
 
-  EXPECT_EQ(1, did_callback);
-  EXPECT_EQ(1u, plugin_loader()->number_of_pending_callbacks());
+  EXPECT_EQ(2, did_callback);
+}
+
+TEST_F(PluginLoaderPosixTest, QueueRequestsAndInvalidate) {
+  int did_callback = 0;
+  PluginService::GetPluginsCallback callback =
+      base::Bind(&VerifyCallback, base::Unretained(&did_callback));
+
+  plugin_loader()->GetPlugins(callback);
+
+  EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
+  message_loop()->RunUntilIdle();
+
+  EXPECT_EQ(0, did_callback);
+  ::testing::Mock::VerifyAndClearExpectations(plugin_loader());
+
+  // Invalidate the plugin list, then queue up another request.
+  PluginList::Singleton()->RefreshPlugins();
+  plugin_loader()->GetPlugins(callback);
+
+  EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
 
   plugin_loader()->canonical_list()->clear();
   plugin_loader()->canonical_list()->push_back(plugin1_.path);
+  plugin_loader()->TestOnPluginLoaded(0, plugin1_);
+  message_loop()->RunUntilIdle();
+
+  // Only the first request should have been fulfilled.
+  EXPECT_EQ(1, did_callback);
+
+  plugin_loader()->canonical_list()->clear();
+  plugin_loader()->canonical_list()->push_back(plugin1_.path);
   plugin_loader()->TestOnPluginLoaded(0, plugin1_);
   message_loop()->RunUntilIdle();
 
   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);
+  plugin_loader()->GetPlugins(callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<WebPluginInfo>& plugins(plugin_loader()->loaded_plugins());
 
@@ skipping 19 matching lines @@
 
   message_loop()->RunUntilIdle();
   EXPECT_EQ(1, did_callback);
 }
 
 TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoadsThenCrash) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
-  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
+  plugin_loader()->GetPlugins(callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(2);
   message_loop()->RunUntilIdle();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<WebPluginInfo>& plugins(plugin_loader()->loaded_plugins());
 
@@ skipping 21 matching lines @@
   EXPECT_EQ(1, did_callback);
 
   plugin_loader()->OnProcessCrashed(42);
 }
 
 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);
+  plugin_loader()->GetPlugins(callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<WebPluginInfo>& plugins(plugin_loader()->loaded_plugins());
 
@@ skipping 17 matching lines @@
 
   message_loop()->RunUntilIdle();
   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);
+  plugin_loader()->GetPlugins(callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
 
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   const std::vector<WebPluginInfo>& plugins(plugin_loader()->loaded_plugins());
 
@@ skipping 11 matching lines @@
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
   EXPECT_EQ(plugin3_.path.value(),
             plugin_loader()->canonical_list()->at(0).value());
 }
 
 TEST_F(PluginLoaderPosixTest, InternalPlugin) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
-  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
+  plugin_loader()->GetPlugins(callback);
 
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
 
   plugin2_.path = base::FilePath("/internal/plugin.plugin");
 
   AddThreePlugins();
 
   plugin_loader()->internal_plugins()->clear();
   plugin_loader()->internal_plugins()->push_back(plugin2_);
@@ skipping 27 matching lines @@
 
   message_loop()->RunUntilIdle();
   EXPECT_EQ(1, did_callback);
 }
 
 TEST_F(PluginLoaderPosixTest, AllCrashed) {
   int did_callback = 0;
   PluginService::GetPluginsCallback callback =
       base::Bind(&VerifyCallback, base::Unretained(&did_callback));
 
-  plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback);
+  plugin_loader()->GetPlugins(callback);
 
   // Spin the loop so that the canonical list of plugins can be set.
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(1);
   message_loop()->RunUntilIdle();
   AddThreePlugins();
 
   EXPECT_EQ(0u, plugin_loader()->next_load_index());
 
   // Mock the first two calls like normal.
   testing::Expectation first =
       EXPECT_CALL(*plugin_loader(), LoadPluginsInternal()).Times(2);
   // On the last call, go through the default impl.
   EXPECT_CALL(*plugin_loader(), LoadPluginsInternal())
       .After(first)
       .WillOnce(
           testing::Invoke(plugin_loader(),
                           &MockPluginLoaderPosix::RealLoadPluginsInternal));
   plugin_loader()->OnProcessCrashed(42);
   plugin_loader()->OnProcessCrashed(42);
   plugin_loader()->OnProcessCrashed(42);
 
   message_loop()->RunUntilIdle();
   EXPECT_EQ(1, did_callback);
 
   EXPECT_EQ(0u, plugin_loader()->loaded_plugins().size());
 }
 
 }  // namespace content