Print preview: Eanble tests that were previous excluded on CrOS. Disable tests on Aura as needed.

BUG=105186
TEST=none

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

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

chrome/browser/printing/print_preview_tab_controller_unittest.cc

@@ -20,7 +20,9 @@ typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest;
 
 // Test crashs on TouchUI due to initiator tab's native view having no parent.
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// Crashes on Aura due to no FocusManager.
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_GetOrCreatePreviewTab DISABLED_GetOrCreatePreviewTab
 #else
 #define MAYBE_GetOrCreatePreviewTab GetOrCreatePreviewTab
@@ -65,7 +67,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_MultiplePreviewTabs DISABLED_MultiplePreviewTabs
 #else
 #define MAYBE_MultiplePreviewTabs MultiplePreviewTabs
@@ -132,7 +135,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_ClearInitiatorTabDetails DISABLED_ClearInitiatorTabDetails
 #else
 #define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails

chrome/browser/ui/webui/print_preview_handler_unittest.cc

@@ -149,7 +149,9 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
 
 // Test crashs on TouchUI due to initiator tab's native view having no parent.
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// Crashes on Aura due to no FocusManager.
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom
 #else
 #define MAYBE_StickyMarginsCustom StickyMarginsCustom
@@ -174,7 +176,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
 #else
 #define MAYBE_StickyMarginsDefault StickyMarginsDefault
@@ -193,7 +196,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_StickyMarginsCustomThenDefault \
     DISABLED_StickyMarginsCustomThenDefault
 #else
@@ -227,7 +231,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_GetLastUsedMarginSettingsCustom \
     DISABLED_GetLastUsedMarginSettingsCustom
 #else
@@ -264,7 +269,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_GetLastUsedMarginSettingsDefault \
     DISABLED_GetLastUsedMarginSettingsDefault
 #else

chrome/browser/ui/webui/print_preview_ui_unittest.cc

@@ -32,7 +32,9 @@ typedef BrowserWithTestWindowTest PrintPreviewUIUnitTest;
 
 // Test crashs on TouchUI due to initiator tab's native view having no parent.
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// Crashes on Aura due to no FocusManager.
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_PrintPreviewData DISABLED_PrintPreviewData
 #else
 #define MAYBE_PrintPreviewData PrintPreviewData
@@ -98,7 +100,8 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages
 #else
 #define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages
@@ -172,7 +175,8 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewDraftPages) {
 }
 
 // http://crbug.com/104284
-#if defined(TOUCH_UI)
+// http://crbug.com/105186
+#if defined(TOUCH_UI) || defined(USE_AURA)
 #define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus
 #else
 #define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus

chrome/chrome_tests.gypi

@@ -904,12 +904,7 @@
             }],
           ],
         }],
-        ['chromeos==1', {
-          'sources!': [
-              # TODO(thestig): Enable when print preview is ready for CrOS.
-             'browser/ui/webui/print_preview_ui_uitest.cc',
-          ],
-        }, { # else: chromeos == 0
+        ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/ui/webui/options/chromeos/'],
           ],
@@ -2149,9 +2144,6 @@
             ['exclude', '^browser/password_manager/native_backend_kwallet_x_unittest.cc'],
             ['exclude', '^browser/safe_browsing/download_protection_service_unittest.cc' ],
             ['exclude', '^../content/browser/geolocation/wifi_data_provider_linux_unittest.cc'],
-            # TODO(thestig) Enable PrintPreviewUI tests on CrOS when
-            # print preview is enabled on CrOS.
-            ['exclude', '^browser/ui/webui/print_preview_ui_unittest.cc'],
           ],
           'conditions': [
             ['use_aura==1', {
@@ -2769,7 +2761,7 @@
         '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_browsertest.cc',
         '../content/browser/speech/speech_input_browsertest.cc',
-	'../content/browser/webkit_browsertest.cc',
+        '../content/browser/webkit_browsertest.cc',
         '../content/renderer/render_view_browsertest.cc',
         '../content/renderer/render_view_browsertest_mac.mm',
         '../content/test/render_widget_browsertest.cc',