Enable AutoImport for Aura.

chrome/browser/first_run/first_run_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 131 matching lines @@
 #define MAYBE_ImportDefault ImportDefault
 #endif
 
 extern const char kImportDefault[] =
     "{\n"
     "}\n";
 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
 // reproduce locally. See http://crbug.com/178062 .
 // TODO(tapted): Investigate why this fails on mac_asan flakily
 // http://crbug.com/181499 .
 #if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER))
 #define MAYBE_ImportBookmarksFile DISABLED_ImportBookmarksFile
 #else
 #define MAYBE_ImportBookmarksFile ImportBookmarksFile
 #endif
 
 // The bookmarks file doesn't actually need to exist for this integration test
 // to trigger the interaction being tested.
 extern const char kImportBookmarksFile[] =
     "{\n"
     "  \"distribution\": {\n"
     "     \"import_bookmarks_from_file\": \"/foo/doesntexists.wtv\"\n"
     "  }\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportBookmarksFile>
     FirstRunMasterPrefsImportBookmarksFile;
 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
 // for http://crbug.com/169984 where this would cause the import process to
 // stay running, and the NTP to be loaded with no apps.
 extern const char kImportNothing[] =
     "{\n"
     "  \"distribution\": {\n"
     "    \"import_bookmarks\": false,\n"
     "    \"import_history\": false,\n"
     "    \"import_home_page\": false,\n"
     "    \"import_search_engine\": false\n"
     "  }\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportNothing>
     FirstRunMasterPrefsImportNothing;
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportNothing,
                        ImportNothingAndShowNewTabPage) {
   EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, first_run::auto_import_state());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
   EXPECT_EQ(1, tab->GetMaxPageID());
 }
 
 #endif  // !defined(OS_CHROMEOS)