| 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");
|
| -}
|
|
|