Plugins: Move Prerender tests to PPAPI and some refactoring.

content/test/ppapi/ppapi_test.cc

 // Copyright 2014 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 "content/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/ppapi_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/base/filename_util.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
-#include "ppapi/shared_impl/test_harness_utils.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #endif
 
 namespace content {
 
 PPAPITestMessageHandler::PPAPITestMessageHandler() {
 }
 
@@ skipping 67 matching lines @@
 
   ASSERT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_STREQ("PASS", handler.message().c_str());
 }
 
 PPAPITest::PPAPITest() : in_process_(true) {
 }
 
 void PPAPITest::SetUpCommandLine(base::CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
-
-  // Append the switch to register the pepper plugin.
-  // library name = <out dir>/<test_name>.<library_extension>
-  // MIME type = application/x-ppapi-<test_name>
-  base::FilePath plugin_dir;
-  EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
-
-  base::FilePath plugin_lib = plugin_dir.Append(ppapi::GetTestLibraryName());
-  EXPECT_TRUE(base::PathExists(plugin_lib));
-  base::FilePath::StringType pepper_plugin = plugin_lib.value();
-  pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
-  command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
-                                   pepper_plugin);
+  ASSERT_TRUE(ppapi::RegisterTestPlugin(command_line));
 
   if (in_process_)
     command_line->AppendSwitch(switches::kPpapiInProcess);
 }
 
 std::string PPAPITest::BuildQuery(const std::string& base,
                                   const std::string& test_case){
   return base::StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str());
 }
 
 OutOfProcessPPAPITest::OutOfProcessPPAPITest() {
   in_process_ = false;
 }
 
 void OutOfProcessPPAPITest::SetUp() {
 #if defined(OS_CHROMEOS)
     chromeos::CrasAudioHandler::InitializeForTesting();
 #endif
   ContentBrowserTest::SetUp();
 }
 
 void OutOfProcessPPAPITest::TearDown() {
   ContentBrowserTest::TearDown();
 #if defined(OS_CHROMEOS)
     chromeos::CrasAudioHandler::Shutdown();
 #endif
 }
 
 }  // namespace content