diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 09:00:38 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 09:00:38 +0000 |
| commit | 09c6050a0834210d8c9973fb836aad4eb90003c4 (patch) | |
| tree | b65f534a2490b467c2e1077fccea81bb9ae3dd08 /chrome/browser/first_run/first_run_browsertest.cc | |
| parent | 2b44aea37a19a0f114750659d88858b94e4dd8ec (diff) | |
| download | chromium_src-09c6050a0834210d8c9973fb836aad4eb90003c4.zip chromium_src-09c6050a0834210d8c9973fb836aad4eb90003c4.tar.gz chromium_src-09c6050a0834210d8c9973fb836aad4eb90003c4.tar.bz2 | |
Enable AutoImport for Aura.
This was likely disabled originally because the import mechanism used to require a message window to wait on the import process. Now that the import process is gone (http://crrev.com/201837) this can simply be re-enabled without changing anything else :)!
BUG=176606
Review URL: https://chromiumcodereview.appspot.com/17115013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run/first_run_browsertest.cc')
| -rw-r--r-- | chrome/browser/first_run/first_run_browsertest.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc index 6f1cf93..5ee11e0 100644 --- a/chrome/browser/first_run/first_run_browsertest.cc +++ b/chrome/browser/first_run/first_run_browsertest.cc @@ -149,14 +149,9 @@ typedef FirstRunMasterPrefsBrowserTestT<kImportDefault> FirstRunMasterPrefsImportDefault; IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportDefault, MAYBE_ImportDefault) { int auto_import_state = first_run::auto_import_state(); - // Aura builds skip over the import process. -#if defined(USE_AURA) - EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, auto_import_state); -#else EXPECT_EQ(first_run::AUTO_IMPORT_CALLED | first_run::AUTO_IMPORT_PROFILE_IMPORTED, auto_import_state); -#endif } // TODO(tapted): Investigate why this fails on Linux bots but does not @@ -182,15 +177,10 @@ typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile> IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportBookmarksFile, MAYBE_ImportBookmarksFile) { int auto_import_state = first_run::auto_import_state(); - // Aura builds skip over the import process. -#if defined(USE_AURA) - EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, auto_import_state); -#else EXPECT_EQ(first_run::AUTO_IMPORT_CALLED | first_run::AUTO_IMPORT_PROFILE_IMPORTED | first_run::AUTO_IMPORT_BOOKMARKS_FILE_IMPORTED, auto_import_state); -#endif } // Test an import with all import options disabled. This is a regression test |