Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2678)

Unified Diff: chrome/browser/resources/pdf/pdf_extension_test.cc

Issue 857863002: Revert of Introduce new test for bookmark loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks-minimal
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/test/data/pdf/bookmarks_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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");
-}
« no previous file with comments | « chrome/browser/resources/pdf/pdf.js ('k') | chrome/test/data/pdf/bookmarks_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698