Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3050)

Unified Diff: chrome/browser/first_run/first_run_browsertest.cc

Issue 17115013: Enable AutoImport for Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run/first_run.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run_browsertest.cc
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 6f1cf93433b11b6cc8b21ae073940b112f2bb0c9..5ee11e00a4318dad3d674ff450247ea83998544f 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
« no previous file with comments | « chrome/browser/first_run/first_run.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698