PDF: Delete non-material viewer

chrome/browser/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 <vector>
 
 #include "base/base_paths.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/hash.h"
@@ skipping 49 matching lines @@
   // Return false so that we iterate through all the guests and verify there is
   // only one.
   return false;
 }
 
 class PDFExtensionTest : public ExtensionApiTest,
                          public testing::WithParamInterface<int> {
  public:
   ~PDFExtensionTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kDisablePdfMaterialUI);
-  }
-
   void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
     ASSERT_TRUE(embedded_test_server()->Start());
   }
 
   void TearDownOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
     ExtensionApiTest::TearDownOnMainThread();
   }
 
@@ skipping 227 matching lines @@
   ASSERT_EQ(1u, downloads.size());
   downloads[0]->Cancel(false);
 }
 
 // We break PDFTest.Load up into kNumberLoadTestParts.
 INSTANTIATE_TEST_CASE_P(PDFTestFiles,
                         PDFExtensionTest,
                         testing::Range(0, kNumberLoadTestParts));
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Basic) {
-  RunTestsInFile("basic_test.js", "test.pdf");
+  RunTestsInFile("basic_test_material.js", "test.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, BasicPlugin) {
   RunTestsInFile("basic_plugin_test.js", "test.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Viewport) {
   RunTestsInFile("viewport_test.js", "test.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Bookmark) {
   RunTestsInFile("bookmarks_test.js", "test-bookmarks.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Navigator) {
   RunTestsInFile("navigator_test.js", "test.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, ParamsParser) {
   RunTestsInFile("params_parser_test.js", "test.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, ZoomManager) {
   RunTestsInFile("zoom_manager_test.js", "test.pdf");
 }
 
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Elements) {
+  // Although this test file does not require a PDF to be loaded, loading the
+  // elements without loading a PDF is difficult.
+  RunTestsInFile("material_elements_test.js", "test.pdf");
+}
+
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, ToolbarManager) {
+  RunTestsInFile("toolbar_manager_test.js", "test.pdf");
+}
+
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Title) {
   RunTestsInFile("title_test.js", "test-title.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, WhitespaceTitle) {
   RunTestsInFile("whitespace_title_test.js", "test-whitespace-title.pdf");
 }
 
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, PageChange) {
   RunTestsInFile("page_change_test.js", "test-bookmarks.pdf");
@@ skipping 137 matching lines @@
 #endif
   ASSERT_TRUE(
       content::ExecuteScript(guest_contents, "viewer.viewport.zoomIn();"));
 
   watcher.Wait();
 #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
   EXPECT_EQ(nullptr, ZoomBubbleView::GetZoomBubble());
 #endif
 }
 
-class MaterialPDFExtensionTest : public PDFExtensionTest {
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kEnablePdfMaterialUI);
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Basic) {
-  RunTestsInFile("basic_test_material.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, BasicPlugin) {
-  RunTestsInFile("basic_plugin_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Viewport) {
-  RunTestsInFile("viewport_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Bookmark) {
-  RunTestsInFile("bookmarks_test.js", "test-bookmarks.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Navigator) {
-  RunTestsInFile("navigator_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, ParamsParser) {
-  RunTestsInFile("params_parser_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, ZoomManager) {
-  RunTestsInFile("zoom_manager_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Elements) {
-  // Although this test file does not require a PDF to be loaded, loading the
-  // elements without loading a PDF is difficult.
-  RunTestsInFile("material_elements_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, ToolbarManager) {
-  RunTestsInFile("toolbar_manager_test.js", "test.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Title) {
-  RunTestsInFile("title_test.js", "test-title.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, WhitespaceTitle) {
-  RunTestsInFile("whitespace_title_test.js", "test-whitespace-title.pdf");
-}
-
-IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, PageChange) {
-  RunTestsInFile("page_change_test.js", "test-bookmarks.pdf");
-}