Build & run unit tests on Aura (Rebase)

Applied patch from http://codereview.chromium.org/8665006/


BUG=none
TEST=duh
TBR=ben@chromium.org

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

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

8 files changed, 68 insertions, 85 deletions

diff --git a/build/all.gyp b/build/all.gyp
index fd49210..991c22f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -606,6 +606,7 @@
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:chrome',
+            '../chrome/chrome.gyp:unit_tests',
             '../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
             '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
             '../ui/aura/aura.gyp:*',
@@ -629,10 +630,9 @@
               ],
             }],
             ['OS=="linux"', {
-              # Aura unit_tests currently only work on Linux.
+              # Tests that currently only work on Linux.
               'dependencies': [
                 '../chrome/chrome.gyp:sync_unit_tests',
-                '../chrome/chrome.gyp:unit_tests',
                 '../content/content.gyp:content_unittests',
                 '../ipc/ipc.gyp:ipc_tests',
                 '../sql/sql.gyp:sql_unittests',
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index f37c92a5..5d0ac6a 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -43,6 +43,17 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
+#if defined(USE_AURA) && defined(OS_WIN)
+// http://crbug.com/105200
+#define MAYBE_StartDownload DISABLED_StartDownload
+#define MAYBE_DownloadOverwriteTest DISABLED_DownloadOverwriteTest
+#define MAYBE_DownloadRemoveTest DISABLED_DownloadRemoveTest
+#else
+#define MAYBE_StartDownload StartDownload
+#define MAYBE_DownloadOverwriteTest DownloadOverwriteTest
+#define MAYBE_DownloadRemoveTest DownloadRemoveTest
+#endif
+
 using content::BrowserThread;
 
 DownloadId::Domain kValidIdDomain = "valid DownloadId::Domain";
@@ -348,7 +359,7 @@ class ItemObserver : public DownloadItem::Observer {
 
 }  // namespace
 
-TEST_F(DownloadManagerTest, StartDownload) {
+TEST_F(DownloadManagerTest, MAYBE_StartDownload) {
   content::TestBrowserThread io_thread(BrowserThread::IO, &message_loop_);
   PrefService* prefs = profile_->GetPrefs();
   prefs->SetFilePath(prefs::kDownloadDefaultDirectory, FilePath());
@@ -681,7 +692,7 @@ TEST_F(DownloadManagerTest, DownloadCancelTest) {
   EXPECT_FALSE(file_util::PathExists(cr_path));
 }
 
-TEST_F(DownloadManagerTest, DownloadOverwriteTest) {
+TEST_F(DownloadManagerTest, MAYBE_DownloadOverwriteTest) {
   using ::testing::_;
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
@@ -771,7 +782,7 @@ TEST_F(DownloadManagerTest, DownloadOverwriteTest) {
   EXPECT_EQ(std::string(kTestData), file_contents);
 }
 
-TEST_F(DownloadManagerTest, DownloadRemoveTest) {
+TEST_F(DownloadManagerTest, MAYBE_DownloadRemoveTest) {
   using ::testing::_;
   using ::testing::CreateFunctor;
   using ::testing::Invoke;
diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
index 6e5941e..921090b 100644
--- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc
@@ -17,17 +17,20 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/url_constants.h"
 
-typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest;
-
-// Test crashs on TouchUI due to initiator tab's native view having no parent.
+// Test crashes on Aura due to initiator tab's native view having no parent.
 // http://crbug.com/104284
-// Crashes on Aura due to no FocusManager.
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
 #define MAYBE_GetOrCreatePreviewTab DISABLED_GetOrCreatePreviewTab
+#define MAYBE_MultiplePreviewTabs DISABLED_MultiplePreviewTabs
+#define MAYBE_ClearInitiatorTabDetails DISABLED_ClearInitiatorTabDetails
 #else
 #define MAYBE_GetOrCreatePreviewTab GetOrCreatePreviewTab
+#define MAYBE_MultiplePreviewTabs MultiplePreviewTabs
+#define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails
 #endif
+
+typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest;
+
 // Create/Get a preview tab for initiator tab.
 TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   ASSERT_TRUE(browser());
@@ -68,13 +71,6 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   EXPECT_EQ(new_preview_tab, preview_tab);
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_MultiplePreviewTabs DISABLED_MultiplePreviewTabs
-#else
-#define MAYBE_MultiplePreviewTabs MultiplePreviewTabs
-#endif
 // To show multiple print preview tabs exist in the same browser for
 // different initiator tabs. If preview tab already exists for an initiator, it
 // gets focused.
@@ -138,13 +134,6 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
   EXPECT_EQ(tab_1_index, browser()->active_index());
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_ClearInitiatorTabDetails DISABLED_ClearInitiatorTabDetails
-#else
-#define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails
-#endif
 // Clear the initiator tab details associated with preview tab.
 TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
   ASSERT_TRUE(browser());
diff --git a/chrome/browser/ui/select_file_dialog_unittest.cc b/chrome/browser/ui/select_file_dialog_unittest.cc
index fff0893..e714f12 100644
--- a/chrome/browser/ui/select_file_dialog_unittest.cc
+++ b/chrome/browser/ui/select_file_dialog_unittest.cc
@@ -17,6 +17,13 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(USE_AURA) && defined(OS_WIN)
+// http://crbug.com/105200
+#define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListenerCall
+#else
+#define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall
+#endif
+
 using content::BrowserThread;
 
 class FileSelectionUser : public SelectFileDialog::Listener {
@@ -74,7 +81,7 @@ typedef testing::Test FileSelectionDialogTest;
 
 // Tests if SelectFileDialog::SelectFile returns asynchronously with
 // file-selection dialogs disabled by policy.
-TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) {
+TEST_F(FileSelectionDialogTest, MAYBE_ExpectAsynchronousListenerCall) {
   MessageLoopForUI message_loop;
   content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
 
diff --git a/chrome/browser/ui/webui/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview_handler_unittest.cc
index 2d2f771..8c935b5 100644
--- a/chrome/browser/ui/webui/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_handler_unittest.cc
@@ -18,6 +18,25 @@
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
 
+// Test crashes on Aura due to initiator tab's native view having no parent.
+// http://crbug.com/104284
+#if defined(USE_AURA)
+#define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom
+#define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
+#define MAYBE_StickyMarginsCustomThenDefault \
+    DISABLED_StickyMarginsCustomThenDefault
+#define MAYBE_GetLastUsedMarginSettingsCustom \
+    DISABLED_GetLastUsedMarginSettingsCustom
+#define MAYBE_GetLastUsedMarginSettingsDefault \
+    DISABLED_GetLastUsedMarginSettingsDefault
+#else
+#define MAYBE_StickyMarginsCustom StickyMarginsCustom
+#define MAYBE_StickyMarginsDefault StickyMarginsDefault
+#define MAYBE_StickyMarginsCustomThenDefault StickyMarginsCustomThenDefault
+#define MAYBE_GetLastUsedMarginSettingsCustom GetLastUsedMarginSettingsCustom
+#define MAYBE_GetLastUsedMarginSettingsDefault GetLastUsedMarginSettingsDefault
+#endif
+
 namespace {
 
 DictionaryValue* GetCustomMarginsDictionary(
@@ -149,15 +168,6 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
   }
 };
 
-// Test crashs on TouchUI due to initiator tab's native view having no parent.
-// http://crbug.com/104284
-// 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
-#endif
 // Tests that margin settings are saved correctly when printing with custom
 // margins selected.
 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) {
@@ -177,13 +187,6 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) {
   CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
-#else
-#define MAYBE_StickyMarginsDefault StickyMarginsDefault
-#endif
 // Tests that margin settings are saved correctly when printing with default
 // margins selected.
 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) {
@@ -197,14 +200,6 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) {
   ASSERT_FALSE(PrintPreviewHandler::last_used_page_size_margins_);
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_StickyMarginsCustomThenDefault \
-    DISABLED_StickyMarginsCustomThenDefault
-#else
-#define MAYBE_StickyMarginsCustomThenDefault StickyMarginsCustomThenDefault
-#endif
 // Tests that margin settings are saved correctly when printing with custom
 // margins selected and then again with default margins selected.
 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) {
@@ -232,14 +227,6 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) {
   CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_GetLastUsedMarginSettingsCustom \
-    DISABLED_GetLastUsedMarginSettingsCustom
-#else
-#define MAYBE_GetLastUsedMarginSettingsCustom GetLastUsedMarginSettingsCustom
-#endif
 // Tests that margin settings are retrieved correctly after printing with custom
 // margins.
 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) {
@@ -270,14 +257,6 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) {
   EXPECT_EQ(kMarginLeft, margin_value);
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_GetLastUsedMarginSettingsDefault \
-    DISABLED_GetLastUsedMarginSettingsDefault
-#else
-#define MAYBE_GetLastUsedMarginSettingsDefault GetLastUsedMarginSettingsDefault
-#endif
 // Tests that margin settings are retrieved correctly after printing with
 // default margins.
 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsDefault) {
diff --git a/chrome/browser/ui/webui/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
index 74fd9cd..e7a79ed 100644
--- a/chrome/browser/ui/webui/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_unittest.cc
@@ -31,14 +31,16 @@ size_t GetConstrainedWindowCount(TabContentsWrapper* tab) {
 
 typedef BrowserWithTestWindowTest PrintPreviewUIUnitTest;
 
-// Test crashs on TouchUI due to initiator tab's native view having no parent.
+// Test crashes on Aura due to initiator tab's native view having no parent.
 // http://crbug.com/104284
-// Crashes on Aura due to no FocusManager.
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
+#if defined(USE_AURA)
+#define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages
 #define MAYBE_PrintPreviewData DISABLED_PrintPreviewData
+#define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus
 #else
 #define MAYBE_PrintPreviewData PrintPreviewData
+#define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages
+#define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus
 #endif
 // Create/Get a preview tab for initiator tab.
 TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) {
@@ -101,13 +103,6 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewData) {
   EXPECT_EQ(NULL, data.get());
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_PrintPreviewDraftPages DISABLED_PrintPreviewDraftPages
-#else
-#define MAYBE_PrintPreviewDraftPages PrintPreviewDraftPages
-#endif
 // Set and get the individual draft pages.
 TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewDraftPages) {
 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
@@ -177,13 +172,6 @@ TEST_F(PrintPreviewUIUnitTest, MAYBE_PrintPreviewDraftPages) {
   EXPECT_EQ(NULL, data.get());
 }
 
-// http://crbug.com/104284
-// http://crbug.com/105186
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#define MAYBE_GetCurrentPrintPreviewStatus DISABLED_GetCurrentPrintPreviewStatus
-#else
-#define MAYBE_GetCurrentPrintPreviewStatus GetCurrentPrintPreviewStatus
-#endif
 // Test the browser-side print preview cancellation functionality.
 TEST_F(PrintPreviewUIUnitTest, MAYBE_GetCurrentPrintPreviewStatus) {
 #if !defined(GOOGLE_CHROME_BUILD) || defined(OS_CHROMEOS)
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e643df3..05ce8ea 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2092,8 +2092,17 @@
           ],
         }],
         ['use_aura==1', {
+          'dependencies': [
+            '../ui/aura/aura.gyp:test_support_aura',
+          ],
           'sources/': [
             ['exclude', '^browser/automation/automation_provider_unittest.cc'],
+            ['exclude', '^browser/accessibility/browser_accessibility_win_unittest.cc'],
+            ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_unittest.cc'],
+            ['exclude', '^browser/ui/views/select_file_dialog_win_unittest.cc'],
+            ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc'],
+            ['exclude', '^browser/ui/panels/auto_hiding_desktop_bar_win_unittest.cc'],
+            ['exclude', '^browser/bookmarks/bookmark_node_data_unittest.cc'],
           ],
         }],
         ['touchui==0', {
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 071b90d..28ffb74 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -31,7 +31,7 @@
 #include <glib.h>
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(USE_AURA)
 // This test fails http://crbug.com/84854, and is very flaky on CrOS and
 // somewhat flaky on other Linux.
 #define MAYBE_ForceShutdown FAILS_ForceShutdown