Chromium Code Reviews| 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 e738d4fc0cc68ab43d6120be3f98ae4817a8db7d..9aececca74fbeb827b95dc7225eeb18ed8020bc9 100644 |
| --- a/chrome/browser/resources/pdf/pdf_extension_test.cc |
| +++ b/chrome/browser/resources/pdf/pdf_extension_test.cc |
| @@ -38,7 +38,8 @@ class PDFExtensionTest : public ExtensionApiTest { |
| ExtensionApiTest::TearDownOnMainThread(); |
| } |
| - void RunTestsInFile(std::string filename, bool requiresPlugin) { |
| + void RunTestsInFile(std::string filename, std::string filepath, |
|
raymes
2015/01/13 07:25:12
nit: each param on a separate line
Alexandre Carlton
2015/01/15 05:01:42
Done.
|
| + bool requiresPlugin) { |
| base::FilePath pdf_plugin_src; |
| PathService::Get(base::DIR_SOURCE_ROOT, &pdf_plugin_src); |
| pdf_plugin_src = pdf_plugin_src.AppendASCII("pdf"); |
| @@ -61,7 +62,7 @@ class PDFExtensionTest : public ExtensionApiTest { |
| extensions::ResultCatcher catcher; |
| - GURL url(embedded_test_server()->GetURL("/pdf/test.pdf")); |
| + GURL url(embedded_test_server()->GetURL(filepath)); |
| GURL extension_url( |
| "chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/index.html?" + |
| url.spec()); |
| @@ -86,13 +87,17 @@ class PDFExtensionTest : public ExtensionApiTest { |
| }; |
| IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Basic) { |
| - RunTestsInFile("basic_test.js", false); |
| + RunTestsInFile("basic_test.js", "/pdf/test.pdf", false); |
|
raymes
2015/01/06 05:52:29
can we just specify the test filename here (e.g. t
Alexandre Carlton
2015/01/15 05:01:42
Done.
|
| } |
| IN_PROC_BROWSER_TEST_F(PDFExtensionTest, BasicPlugin) { |
| - RunTestsInFile("basic_plugin_test.js", true); |
| + RunTestsInFile("basic_plugin_test.js", "/pdf/test.pdf", true); |
| } |
| IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Viewport) { |
| - RunTestsInFile("viewport_test.js", false); |
| + RunTestsInFile("viewport_test.js", "/pdf/test.pdf", false); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Bookmark) { |
| + RunTestsInFile("bookmarks_test.js", "/pdf/test-bookmarks.pdf", false); |
| } |