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

chrome/browser/plugin_exceptions_table_model_unittest.cc

 // 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.
 
 #include "app/table_model_observer.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/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/plugins/plugin_group.h"
-#include "webkit/glue/plugins/webplugininfo.h"
+#include "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/plugins/npapi/webplugininfo.h"
 
 // Can't be an internal namespace because PluginExceptionsTableModel declares
 // as a friend.
 namespace plugin_test_internal {
 
 using ::testing::_;
 using ::testing::Invoke;
 
 class MockTableModelObserver : public TableModelObserver {
  public:
@@ skipping 50 matching lines @@
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "b-bar",
                            CONTENT_SETTING_BLOCK);
     map->SetContentSetting(example_com,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            "b-bar",
                            CONTENT_SETTING_ALLOW);
 
     table_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);
 
     table_model_->set_plugins(plugins);
     table_model_->ReloadSettings();
   }
 
  protected:
   void CheckInvariants() {
     typedef std::deque<PluginExceptionsTableModel::SettingsEntry> Entries;
     Entries& settings = table_model_->settings_;
@@ skipping 95 matching lines @@
   plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnModelChanged());
   table_model_->RemoveAll();
   EXPECT_EQ(0, table_model_->RowCount());
   EXPECT_EQ(0, static_cast<int>(table_model_->GetGroups().size()));
   CheckInvariants();
   table_model_->SetObserver(NULL);
 }