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

Unified Diff: chrome/test/data/pdf/pdf_extension_test.cc

Issue 290803007: Re-enable PDFExtensionTest.BasicPlugin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/test/data/pdf/basic_plugin_test.js ('k') | chrome/test/data/pdf/viewport_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/pdf/pdf_extension_test.cc
diff --git a/chrome/test/data/pdf/pdf_extension_test.cc b/chrome/test/data/pdf/pdf_extension_test.cc
deleted file mode 100644
index 574dbc8083abdaa79a7d3c52cf4e2d343b8ca486..0000000000000000000000000000000000000000
--- a/chrome/test/data/pdf/pdf_extension_test.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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/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"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/manifest_handlers/mime_types_handler.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/test/browser_test_utils.h"
-#include "grit/browser_resources.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-
-class PDFExtensionTest : public ExtensionApiTest {
- public:
- virtual ~PDFExtensionTest() {}
-
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
- ExtensionApiTest::SetUpCommandLine(command_line);
- command_line->AppendSwitch(switches::kOutOfProcessPdf);
- }
-
- virtual void SetUpOnMainThread() OVERRIDE {
- ExtensionApiTest::SetUpOnMainThread();
- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
- }
-
-
- virtual void CleanUpOnMainThread() OVERRIDE {
- ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
- ExtensionApiTest::CleanUpOnMainThread();
- }
-
- void RunTestsInFile(std::string filename, bool requiresPlugin) {
-#if !defined(GOOGLE_CHROME_BUILD)
- base::FilePath pdf_plugin_src;
- PathService::Get(base::DIR_SOURCE_ROOT, &pdf_plugin_src);
- pdf_plugin_src = pdf_plugin_src.AppendASCII("pdf");
- if (requiresPlugin && !base::DirectoryExists(pdf_plugin_src)) {
- LOG(WARNING) << "Not running " << filename <<
- " because it requires the PDF plugin which is not available.";
- return;
- }
-#endif
- 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 =
- service->extensions()->GetByID("mhjfbmdgcfjbbpaeojofohoefgiehjai");
- ASSERT_TRUE(extension);
- ASSERT_TRUE(MimeTypesHandler::GetHandler(
- extension)->CanHandleMIMEType("application/pdf"));
-
- ResultCatcher catcher;
-
- 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", false);
-}
-
-// TODO(raymes): investigate why this started failing after PDF plugin became
-// open source.
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, DISABLED_BasicPlugin) {
- RunTestsInFile("basic_plugin_test.js", true);
-}
-
-IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Viewport) {
- RunTestsInFile("viewport_test.js", false);
-}
« no previous file with comments | « chrome/test/data/pdf/basic_plugin_test.js ('k') | chrome/test/data/pdf/viewport_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698