Finish moving plugin probing out of process.

chrome/browser/chromeos/gview_request_interceptor_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 <string>
 
+#include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/dummy_resource_handler.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
@@ skipping 43 matching lines @@
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   GViewRequestProtocolFactory() {}
   virtual ~GViewRequestProtocolFactory() {}
 
   virtual net::URLRequestJob* MaybeCreateJob(net::URLRequest* request) const {
     return new GViewURLRequestTestJob(request);
   }
 };
 
+void QuitMessageLoop(const std::vector<webkit::WebPluginInfo>&) {
+  MessageLoop::current()->Quit();
+}
+
 class GViewRequestInterceptorTest : public testing::Test {
  public:
   GViewRequestInterceptorTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
   virtual void SetUp() {
     content::ResourceContext* resource_context =
         content::MockResourceContext::GetInstance();
@@ skipping 22 matching lines @@
         content::MockResourceContext::GetInstance();
     net::URLRequestContext* request_context =
         resource_context->request_context();
     request_context->set_job_factory(old_factory_);
     ChromePluginServiceFilter* filter =
         ChromePluginServiceFilter::GetInstance();
     filter->UnregisterResourceContext(resource_context);
     PluginService::GetInstance()->set_filter(NULL);
   }
 
+  // GetPluginInfoByPath() will only use stale information. Because plugin
+  // refresh is asynchronous, spin a MessageLoop until the callback is run,
+  // after which, the test will continue.
   void RegisterPDFPlugin() {
     webkit::WebPluginInfo info;
     info.path = pdf_path_;
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
-    webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+
+    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
+    MessageLoop::current()->Run();
   }
 
   void UnregisterPDFPlugin() {
     webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
-    webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+
+    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
+    MessageLoop::current()->Run();
   }
 
   void SetPDFPluginLoadedState(bool want_loaded) {
     webkit::WebPluginInfo info;
-    bool is_loaded =
-        webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
-            pdf_path_, &info);
+    bool is_loaded = PluginService::GetInstance()->GetPluginInfoByPath(
+        pdf_path_, &info);
     if (is_loaded && !want_loaded) {
       UnregisterPDFPlugin();
-      is_loaded = webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
+      is_loaded = PluginService::GetInstance()->GetPluginInfoByPath(
           pdf_path_, &info);
     } else if (!is_loaded && want_loaded) {
       // This "loads" the plug-in even if it's not present on the
       // system - which is OK since we don't actually use it, just
       // need it to be "enabled" for the test.
       RegisterPDFPlugin();
-      is_loaded = webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
+      is_loaded = PluginService::GetInstance()->GetPluginInfoByPath(
           pdf_path_, &info);
     }
     EXPECT_EQ(want_loaded, is_loaded);
   }
 
   void SetupRequest(net::URLRequest* request) {
     content::ResourceContext* context =
         content::MockResourceContext::GetInstance();
     ResourceDispatcherHostRequestInfo* info =
         new ResourceDispatcherHostRequestInfo(handler_,
@@ skipping 92 matching lines @@
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://docs.google.com/gview?url=http%3A//foo.com/file.ppt"),
                  request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos