Make WebPluginInfo more generic

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/message_loop.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/plugin_service.h"
@@ skipping 54 matching lines @@
  public:
   virtual void SetUp() {
     job_factory_.SetProtocolHandler("http", new GViewRequestProtocolFactory);
     job_factory_.AddInterceptor(new GViewRequestInterceptor);
     request_context_ = new TestURLRequestContext;
     request_context_->set_job_factory(&job_factory_);
     ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
   }
 
   void RegisterPDFPlugin() {
-    webkit::npapi::WebPluginInfo info;
+    webkit::WebPluginInfo info;
     info.path = pdf_path_;
-    info.enabled = webkit::npapi::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
+    info.enabled = webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void UnregisterPDFPlugin() {
     webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void SetPDFPluginLoadedState(bool want_loaded, bool* out_is_enabled) {
-    webkit::npapi::WebPluginInfo info;
+    webkit::WebPluginInfo info;
     bool is_loaded =
         webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
             pdf_path_, &info);
     if (is_loaded && !want_loaded) {
       UnregisterPDFPlugin();
       is_loaded = webkit::npapi::PluginList::Singleton()->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(
           pdf_path_, &info);
     }
     EXPECT_EQ(want_loaded, is_loaded);
-    *out_is_enabled = webkit::npapi::IsPluginEnabled(info);
+    *out_is_enabled = webkit::IsPluginEnabled(info);
   }
 
  protected:
   MessageLoopForIO message_loop_;
   net::URLRequestJobFactory job_factory_;
   scoped_refptr<TestURLRequestContext> request_context_;
   TestDelegate test_delegate_;
   FilePath pdf_path_;
 };
 
@@ skipping 73 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