Revert of Introduce new test for bookmark loading.

Revert of Introduce new test for bookmark loading. (patchset #8 id:130001 of https://codereview.chromium.org/840493002/)

Reason for revert:
Failing on bots

http://build.chromium.org/p/chromium.webkit/builders/Linux%20Tests%20%28dbg%29/builds/5305/steps/browser_tests/logs/Bookmark

Original issue's description:
> Introduce new test for bookmark loading.
> 
> BUG=110020
> 
> Committed: https://crrev.com/50567ebbd5ca2ff79d87382addc11d25658776d2
> Cr-Commit-Position: refs/heads/master@{#312076}

TBR=raymes@chromium.org,sammc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=110020

[Alexandre Carlton, 2015-01-19 22:54:36]

Created Revert of Introduce new test for bookmark loading.

[commit-bot: I haz the power, 2015-01-19 22:55:12]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/857863002/1

[commit-bot: I haz the power, 2015-01-19 22:55:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-19 22:55:14]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer,
_not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[raymes, 2015-01-19 23:28:33]

The CQ bit was checked by raymes@chromium.org

[commit-bot: I haz the power, 2015-01-19 23:28:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/857863002/1

[Sam McNally, 2015-01-19 23:28:43]

lgtm

[commit-bot: I haz the power, 2015-01-19 23:28:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-19 23:28:44]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer,
_not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[raymes, 2015-01-19 23:28:51]

The CQ bit was checked by raymes@chromium.org

[commit-bot: I haz the power, 2015-01-19 23:28:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/857863002/1

[commit-bot: I haz the power, 2015-01-19 23:29:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-19 23:29:11]

Failed to apply patch for chrome/browser/resources/pdf/pdf_extension_test.cc:
While running git apply --index -3 -p1;
  error: patch failed: chrome/browser/resources/pdf/pdf_extension_test.cc:87
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/resources/pdf/pdf_extension_test.cc' with
conflicts.
  U chrome/browser/resources/pdf/pdf_extension_test.cc

Patch:       chrome/browser/resources/pdf/pdf_extension_test.cc
Index: chrome/browser/resources/pdf/pdf_extension_test.cc
diff --git a/chrome/browser/resources/pdf/pdf_extension_test.cc
b/chrome/browser/resources/pdf/pdf_extension_test.cc
index
2ba39addc1ea6106f4dba3b420a21fa8813ff46f..e738d4fc0cc68ab43d6120be3f98ae4817a8db7d
100644
--- a/chrome/browser/resources/pdf/pdf_extension_test.cc
+++ b/chrome/browser/resources/pdf/pdf_extension_test.cc
@@ -38,12 +38,11 @@
     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;
@@ -62,7 +61,7 @@
 
     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());
@@ -87,17 +86,13 @@
 };
 
 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");
-}