Re-enable PDFExtensionTest.BasicPlugin

chrome/browser/resources/pdf/pdf_extension_test.cc

Index: chrome/browser/resources/pdf/pdf_extension_test.cc
diff --git a/chrome/test/data/pdf/pdf_extension_test.cc b/chrome/browser/resources/pdf/pdf_extension_test.cc
similarity index 89%
rename from chrome/test/data/pdf/pdf_extension_test.cc
rename to chrome/browser/resources/pdf/pdf_extension_test.cc
index 574dbc8083abdaa79a7d3c52cf4e2d343b8ca486..73b6b80743385f4a5ad0672efdf61fab1a5e5632 100644
--- a/chrome/test/data/pdf/pdf_extension_test.cc
+++ b/chrome/browser/resources/pdf/pdf_extension_test.cc
@@ -37,7 +37,6 @@ class PDFExtensionTest : public ExtensionApiTest {
   }
 
   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");
@@ -46,7 +45,6 @@ class PDFExtensionTest : public ExtensionApiTest {
           " 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,
@@ -87,9 +85,16 @@ 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) {
+// TODO(raymes): This fails with component builds on linux because the plugin
+// plugin crashes due to something related to how the plugin DLL is
+// compiled/linked. crbug.com/386436.
+#if defined(LINUX) && defined(COMPONENT_BUILD)
+#define MAYBE_BasicPlugin DISABLED_BasicPlugin
+#else
+#define MAYBE_BasicPlugin BasicPlugin
+#endif
+
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, MAYBE_BasicPlugin) {
   RunTestsInFile("basic_plugin_test.js", true);
 }