Move webplugininfo.h to content/public.

chrome/renderer/chrome_content_renderer_client_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/renderer/chrome_content_renderer_client.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_builder.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "content/public/common/webplugininfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "url/gurl.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebPluginParams;
 using WebKit::WebString;
 using WebKit::WebVector;
 using chrome::ChromeContentRendererClient;
-using webkit::WebPluginInfo;
-using webkit::WebPluginMimeType;
+using content::WebPluginInfo;
+using content::WebPluginMimeType;
 
 namespace chrome {
 
 namespace {
 const bool kNaClRestricted = false;
 const bool kNaClUnrestricted = true;
 const bool kExtensionRestricted = false;
 const bool kExtensionUnrestricted = true;
 const bool kExtensionNotFromWebStore = false;
 const bool kExtensionFromWebStore = true;
@@ skipping 17 matching lines @@
 
 void AddFakeDevAttribute(WebPluginParams* params) {
   WebVector<WebString> names(static_cast<size_t>(1));
   WebVector<WebString> values(static_cast<size_t>(1));
   names[0] = WebString::fromUTF8("@dev");
   values[0] = WebString();
   params->attributeNames.swap(names);
   params->attributeValues.swap(values);
 }
 
-void AddContentTypeHandler(WebPluginInfo* info,
+void AddContentTypeHandler(content::WebPluginInfo* info,
                            const char* mime_type,
                            const char* manifest_url) {
-  WebPluginMimeType mime_type_info;
+  content::WebPluginMimeType mime_type_info;
   mime_type_info.mime_type = mime_type;
   mime_type_info.additional_param_names.push_back(UTF8ToUTF16("nacl"));
   mime_type_info.additional_param_values.push_back(
       UTF8ToUTF16(manifest_url));
   info->mime_types.push_back(mime_type_info);
 }
 }  // namespace
 
 typedef testing::Test ChromeContentRendererClientTest;
 
@@ skipping 252 matching lines @@
         GURL("http://example.evil.com/test.html"),
         kNaClRestricted,
         CreateHostedApp(kExtensionRestricted,
                         kExtensionNotFromWebStore,
                         "http://example.com/").get(),
         &params));
   }
 }
 
 }  // namespace chrome