Enable PrintPreview by default on Mac

FYI, this rolls back changes made in
http://codereview.chromium.org/7080040/
to disable Mac for M13, plus does changes to print_preview.js (WebUI tests).

BUG=84500
R=vandebo@chromium.org
TEST=trybots


Review URL: http://codereview.chromium.org/7486016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93581 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 9 insertions, 11 deletions

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 03cd23c..5452483 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -175,10 +175,9 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableGpuVsync)
   },
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX)
+#if !defined(GOOGLE_CHROME_BUILD)
   // Only expose this for Chromium builds where users may not have the PDF
-  // plugin. Do not give Google Chrome users the option to disable it here,
-  // except on Mac, where it is disabled.
+  // plugin. Do not give Google Chrome users the option to disable it here.
   {
     "print-preview",  // FLAGS:RECORD_UMA
     IDS_FLAGS_PRINT_PREVIEW_NAME,
diff --git a/chrome/browser/ui/webui/print_preview_ui_uitest.cc b/chrome/browser/ui/webui/print_preview_ui_uitest.cc
index 10f8d70..002751e 100644
--- a/chrome/browser/ui/webui/print_preview_ui_uitest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_uitest.cc
@@ -20,7 +20,7 @@ class PrintPreviewUITest : public UITest {
  public:
   PrintPreviewUITest() {
     dom_automation_enabled_ = true;
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
     launch_arguments_.AppendSwitch(switches::kEnablePrintPreview);
 #endif
   }
diff --git a/chrome/browser/ui/webui/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
index 184af49..65613d3 100644
--- a/chrome/browser/ui/webui/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
@@ -23,7 +23,7 @@ typedef BrowserWithTestWindowTest PrintPreviewUITest;
 
 // Create/Get a preview tab for initiator tab.
 TEST_F(PrintPreviewUITest, PrintPreviewData) {
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePrintPreview);
 #endif
   ASSERT_TRUE(browser());
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 95d4831..41bc291 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1216,7 +1216,7 @@ const char kExposePrivateExtensionApi[]   = "expose-private-extension-api";
 const char kTouchDevices[]                  = "touch-devices";
 #endif
 
-#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
 // Disable print preview (Not exposed via about:flags. Only used for testing.)
 const char kDisablePrintPreview[]           = "disable-print-preview";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 54b36a2..8a71040 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -362,7 +362,7 @@ extern const char kExposePrivateExtensionApi[];
 extern const char kTouchDevices[];
 #endif
 
-#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
 extern const char kDisablePrintPreview[];
 #else
 extern const char kEnablePrintPreview[];
diff --git a/chrome/renderer/print_web_view_helper_browsertest.cc b/chrome/renderer/print_web_view_helper_browsertest.cc
index 2bfa797..86aec37 100644
--- a/chrome/renderer/print_web_view_helper_browsertest.cc
+++ b/chrome/renderer/print_web_view_helper_browsertest.cc
@@ -102,7 +102,7 @@ class PrintWebViewHelperTest : public PrintWebViewHelperTestBase {
 
   virtual void SetUp() {
     // Append the print preview switch before creating the PrintWebViewHelper.
-#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kDisablePrintPreview);
 #endif
@@ -302,7 +302,7 @@ class PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
 
   virtual void SetUp() {
     // Append the print preview switch before creating the PrintWebViewHelper.
-#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_MACOSX)
+#if !defined(GOOGLE_CHROME_BUILD)
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnablePrintPreview);
 #endif
diff --git a/chrome/test/data/webui/print_preview.js b/chrome/test/data/webui/print_preview.js
index 7b83977..9b41b76 100644
--- a/chrome/test/data/webui/print_preview.js
+++ b/chrome/test/data/webui/print_preview.js
@@ -102,8 +102,7 @@ GEN(' protected:');
 GEN('  // WebUIBrowserTest override.');
 GEN('  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {');
 GEN('    WebUIBrowserTest::SetUpCommandLine(command_line);');
-GEN('#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS) || \\');
-GEN('    defined(OS_MACOSX)');
+GEN('#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)');
 GEN('    // Don\'t enable the flag for chrome builds, which should be on by ' +
     'default.');
 GEN('    command_line->AppendSwitch(switches::kEnablePrintPreview);');