Move webplugininfo.h to content/public.

chrome/browser/extensions/extension_nacl_browsertest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using content::PluginService;
 using content::WebContents;
 using extensions::Extension;
 using extensions::Manifest;
 
 namespace {
 
 const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced";
 
@@ skipping 64 matching lines @@
 
   const Extension* InstallHostedApp() {
     base::FilePath file_path = test_data_dir_.AppendASCII(
         "native_client_hosted_app");
     return InstallExtension(file_path, INSTALL_TYPE_FROM_WEBSTORE);
   }
 
   bool IsNaClPluginLoaded() {
     base::FilePath path;
     if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
-      webkit::WebPluginInfo info;
+      content::WebPluginInfo info;
       return PluginService::GetInstance()->GetPluginInfoByPath(path, &info);
     }
     return false;
   }
 
   void CheckPluginsCreated(const GURL& url, PluginType expected_to_succeed) {
     ui_test_utils::NavigateToURL(browser(), url);
     // Don't run tests if the NaCl plugin isn't loaded.
     if (!IsNaClPluginLoaded())
       return;
@@ skipping 86 matching lines @@
   replace_host.SetHostStr(host_str);
   replace_host.ClearPort();
   url = url.ReplaceComponents(replace_host);
 
   const Extension* extension = InstallHostedApp();
   ASSERT_TRUE(extension);
   CheckPluginsCreated(url, PLUGIN_TYPE_ALL);
 }
 
 }  // namespace