Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/ui/cocoa/table_model_array_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
-#include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/webplugininfo.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/webplugininfo.h"
 
 class TableModelArrayControllerTest : public CocoaTest {
  public:
   TableModelArrayControllerTest()
       : command_line_(CommandLine::ForCurrentProcess(),
                       *CommandLine::ForCurrentProcess()) {}
 
   virtual void SetUp() {
     CocoaTest::SetUp();
 
@@ skipping 13 matching lines @@
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "b-bar",
                            CONTENT_SETTING_BLOCK);
     map->SetContentSetting(example_com,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "b-bar",
                            CONTENT_SETTING_ALLOW);
 
     model_.reset(new MockPluginExceptionsTableModel(map, NULL));
 
-    std::vector<PluginGroup> plugins;
-    WebPluginInfo foo_plugin;
+    std::vector<webkit::npapi::PluginGroup> plugins;
+    webkit::npapi::WebPluginInfo foo_plugin;
     foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo"));
     foo_plugin.name = ASCIIToUTF16("FooPlugin");
     foo_plugin.enabled = true;
-    scoped_ptr<PluginGroup> foo_group(
-        PluginGroup::FromWebPluginInfo(foo_plugin));
+    scoped_ptr<webkit::npapi::PluginGroup> foo_group(
+        webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin));
     plugins.push_back(*foo_group);
-    WebPluginInfo bar_plugin;
+    webkit::npapi::WebPluginInfo bar_plugin;
     bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar"));
     bar_plugin.name = ASCIIToUTF16("BarPlugin");
     bar_plugin.enabled = true;
-    scoped_ptr<PluginGroup> bar_group(
-        PluginGroup::FromWebPluginInfo(bar_plugin));
+    scoped_ptr<webkit::npapi::PluginGroup> bar_group(
+        webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin));
     plugins.push_back(*bar_group);
-    WebPluginInfo blurp_plugin;
+    webkit::npapi::WebPluginInfo blurp_plugin;
     blurp_plugin.path = FilePath(FILE_PATH_LITERAL("c-blurp"));
     blurp_plugin.name = ASCIIToUTF16("BlurpPlugin");
     blurp_plugin.enabled = true;
-    scoped_ptr<PluginGroup> blurp_group(
-        PluginGroup::FromWebPluginInfo(blurp_plugin));
+    scoped_ptr<webkit::npapi::PluginGroup> blurp_group(
+        webkit::npapi::PluginGroup::FromWebPluginInfo(blurp_plugin));
     plugins.push_back(*blurp_group);
 
     model_->set_plugins(plugins);
     model_->LoadSettings();
 
     id content = [NSMutableArray array];
     controller_.reset(
         [[TableModelArrayController alloc] initWithContent:content]);
     NSDictionary* columns = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInt:IDS_EXCEPTIONS_HOSTNAME_HEADER], @"title",
@@ skipping 78 matching lines @@
   [controller setSelectionIndexes:indexes];
   [controller remove:nil];
   titles = [[controller arrangedObjects] valueForKey:@"title"];
   EXPECT_NSEQ(@"(\n"
               @"    BarPlugin,\n"
               @"    \"[*.]example.com\",\n"
               @"    \"[*.]moose.org\"\n"
               @")",
               [titles description]);
 }