Revert of Introduce new test for bookmark loading.

chrome/browser/resources/pdf/pdf_extension_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 "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 20 matching lines @@
     ExtensionApiTest::SetUpOnMainThread();
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   }
 
 
   virtual void TearDownOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
     ExtensionApiTest::TearDownOnMainThread();
   }
 
-  void RunTestsInFile(std::string filename,
-                      std::string pdf_filename) {
+  void RunTestsInFile(std::string filename, bool requiresPlugin) {
     base::FilePath pdf_plugin_src;
     PathService::Get(base::DIR_SOURCE_ROOT, &pdf_plugin_src);
     pdf_plugin_src = pdf_plugin_src.AppendASCII("pdf");
-    if (!base::DirectoryExists(pdf_plugin_src)) {
+    if (requiresPlugin && !base::DirectoryExists(pdf_plugin_src)) {
       LOG(WARNING) << "Not running " << filename <<
           " because it requires the PDF plugin which is not available.";
       return;
     }
     ExtensionService* service = extensions::ExtensionSystem::Get(
         profile())->extension_service();
     service->component_loader()->Add(IDR_PDF_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("pdf")));
     const extensions::Extension* extension =
         extensions::ExtensionRegistry::Get(profile())
             ->enabled_extensions()
             .GetByID("mhjfbmdgcfjbbpaeojofohoefgiehjai");
     ASSERT_TRUE(extension);
     ASSERT_TRUE(MimeTypesHandler::GetHandler(
         extension)->CanHandleMIMEType("application/pdf"));
 
     extensions::ResultCatcher catcher;
 
-    GURL url(embedded_test_server()->GetURL("/pdf/" + pdf_filename));
+    GURL url(embedded_test_server()->GetURL("/pdf/test.pdf"));
     GURL extension_url(
         "chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/index.html?" +
         url.spec());
     ui_test_utils::NavigateToURL(browser(), extension_url);
     content::WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     content::WaitForLoadStop(contents);
 
     base::FilePath test_data_dir;
     PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir);
     test_data_dir = test_data_dir.Append(
         FILE_PATH_LITERAL("chrome/test/data/pdf"));
     test_data_dir = test_data_dir.AppendASCII(filename);
 
     std::string test_js;
     ASSERT_TRUE(base::ReadFileToString(test_data_dir, &test_js));
     ASSERT_TRUE(content::ExecuteScript(contents, test_js));
 
     if (!catcher.GetNextResult())
       FAIL() << catcher.message();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Basic) {
-  RunTestsInFile("basic_test.js", "test.pdf");
+  RunTestsInFile("basic_test.js", false);
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, BasicPlugin) {
-  RunTestsInFile("basic_plugin_test.js", "test.pdf");
+  RunTestsInFile("basic_plugin_test.js", true);
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Viewport) {
-  RunTestsInFile("viewport_test.js", "test.pdf");
+  RunTestsInFile("viewport_test.js", false);
 }
-
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Bookmark) {
-  RunTestsInFile("bookmarks_test.js", "test-bookmarks.pdf");
-}