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

chrome/test/plugin/plugin_test.cpp

 // 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.
 
 // Tests for the top plugins to catch regressions in our plugin host code, as
 // well as in the out of process code.  Currently this tests:
 //  Flash
 //  Real
 //  QuickTime
 //  Windows Media Player
@@ skipping 30 matching lines @@
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/npapi/bindings/npapi.h"
-#include "webkit/glue/plugins/plugin_constants_win.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
 
 class PluginTest : public UITest {
  public:
   // Generate the URL for testing a particular test.
   // HTML for the tests is all located in test_directory\plugin\<testcase>
   // Set |mock_http| to true to use mock HTTP server.
@@ skipping 20 matching lines @@
       // the installer might not have run on this machine, add it manually.
       base::win::RegKey regkey;
       if (regkey.Open(HKEY_LOCAL_MACHINE,
                       L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList",
                       KEY_WRITE)) {
         regkey.CreateKey(L"CHROME.EXE", KEY_READ);
       }
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
       // the new plugin.
-      launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch);
+      launch_arguments_.AppendSwitch(switches::kUseOldWMPPlugin);
     } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
       launch_arguments_.AppendSwitchASCII(switches::kTestSandbox,
                                           "security_tests.dll");
     }
 
     UITest::SetUp();
   }
 #endif  // defined(OS_WIN)
 
   void TestPlugin(const std::string& test_case,
@@ skipping 246 matching lines @@
 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) {
   MessageLoop loop(MessageLoop::TYPE_IO);
   Start();
   loop.Run();
 
   EXPECT_TRUE(success());
   EXPECT_TRUE(initial_download_path().BaseName().value() ==
               final_download_path().BaseName().value());
 }
 #endif  // defined(OS_WIN)