Pepper: Move more stuff to content_browsertests.

chrome/test/ppapi/ppapi_test.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/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
@@ skipping 154 matching lines @@
   std::string query = BuildQuery(std::string(), test_case);
   replacements.SetQuery(query.c_str(), url::Component(0, query.size()));
   return test_url.ReplaceComponents(replacements);
 }
 
 void PPAPITestBase::RunTest(const std::string& test_case) {
   GURL url = GetTestFileUrl(test_case);
   RunTestURL(url);
 }
 
-void PPAPITestBase::RunTestAndReload(const std::string& test_case) {
-  GURL url = GetTestFileUrl(test_case);
-  RunTestURL(url);
-  // If that passed, we simply run the test again, which navigates again.
-  RunTestURL(url);
-}
-
 void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
   base::FilePath document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
   base::FilePath http_document_root;
   ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
   net::SpawnedTestServer http_server(net::SpawnedTestServer::TYPE_HTTP,
                                      net::SpawnedTestServer::kLocalhost,
                                      document_root);
   ASSERT_TRUE(http_server.Start());
   RunTestURL(GetTestURL(http_server, test_case, std::string()));
@@ skipping 161 matching lines @@
   EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   EXPECT_TRUE(base::PathExists(plugin_lib));
 }
 
 void PPAPINaClTest::RunTest(const std::string& test_case) {
 #if !defined(DISABLE_NACL)
   PPAPITestBase::RunTest(test_case);
 #endif
 }
 
-void PPAPINaClTest::RunTestAndReload(const std::string& test_case) {
-#if !defined(DISABLE_NACL)
-  PPAPITestBase::RunTestAndReload(test_case);
-#endif
-}
-
 void PPAPINaClTest::RunTestViaHTTP(const std::string& test_case) {
 #if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestViaHTTP(test_case);
 #endif
 }
 
 void PPAPINaClTest::RunTestWithSSLServer(const std::string& test_case) {
 #if !defined(DISABLE_NACL)
   PPAPITestBase::RunTestWithSSLServer(test_case);
 #endif
@@ skipping 94 matching lines @@
 }
 
 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
   // The default content setting for the PPAPI broker is ASK. We purposefully
   // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
 
   base::FilePath plugin_lib;
   EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   EXPECT_TRUE(base::PathExists(plugin_lib));
 }