Re-enable PDFExtensionTest.BasicPlugin

chrome/browser/resources/pdf/pdf_extension_test.cc

 // 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"
@@ skipping 19 matching lines @@
     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"));
 
@@ skipping 20 matching lines @@
 
     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) {
+// 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);
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Viewport) {
   RunTestsInFile("viewport_test.js", false);
 }