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

chrome/browser/plugins/plugin_prefs_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 "chrome/browser/plugins/plugin_prefs.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/webplugininfo.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 using content::BrowserThread;
 using content::PluginService;
 
 namespace {
 
 void CanEnablePluginCallback(const base::Closure& quit_closure,
@@ skipping 170 matching lines @@
   EXPECT_EQ(PluginPrefs::NO_POLICY,
             plugin_prefs_->PolicyStatusForPlugin(kGoogleMars));
   EXPECT_EQ(PluginPrefs::POLICY_DISABLED,
             plugin_prefs_->PolicyStatusForPlugin(k42));
 }
 
 // Linux Aura doesn't support NPAPI.
 #if !(defined(OS_LINUX) && defined(USE_AURA))
 
 TEST_F(PluginPrefsTest, UnifiedPepperFlashState) {
+  content::TestBrowserThreadBundle browser_threads;
   base::ShadowingAtExitManager at_exit_manager_;  // Destroys the PluginService.
 
-  base::MessageLoop message_loop;
-  content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
   PluginService::GetInstance()->Init();
   PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
 
   base::string16 component_updated_plugin_name(
       ASCIIToUTF16("Component-updated Pepper Flash"));
   content::WebPluginInfo component_updated_plugin_1(
       component_updated_plugin_name,
       GetComponentUpdatedPepperFlashPath(FILE_PATH_LITERAL("11.3.31.227")),
       ASCIIToUTF16("11.3.31.227"),
       ASCIIToUTF16(""));
@@ skipping 53 matching lines @@
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 
   EnablePluginSynchronously(true, bundled_plugin.path, true);
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_1));
   EXPECT_FALSE(plugin_prefs_->IsPluginEnabled(component_updated_plugin_2));
   EXPECT_TRUE(plugin_prefs_->IsPluginEnabled(bundled_plugin));
 }
 
 #endif