Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / first_run / first_run_browsertest.cc

diff --git a/src/chrome/browser/first_run/first_run_browsertest.cc b/src/chrome/browser/first_run/first_run_browsertest.cc
index 392d68e..5104498 100644 (file)
--- a/src/chrome/browser/first_run/first_run_browsertest.cc
+++ b/src/chrome/browser/first_run/first_run_browsertest.cc
@@ -141,9 +141,13 @@ class FirstRunMasterPrefsBrowserTestT
 // bot configurations do not have another profile (browser) to import from and
 // thus the import must not be expected to have occurred.
 int MaskExpectedImportState(int expected_import_state) {
-  scoped_refptr<ImporterList> importer_list(new ImporterList());
-  importer_list->DetectSourceProfilesHack(
-      g_browser_process->GetApplicationLocale(), false);
+  scoped_ptr<ImporterList> importer_list(new ImporterList());
+  base::RunLoop run_loop;
+  importer_list->DetectSourceProfiles(
+      g_browser_process->GetApplicationLocale(),
+      false,  // include_interactive_profiles?
+      run_loop.QuitClosure());
+  run_loop.Run();
   int source_profile_count = importer_list->count();
 #if defined(OS_WIN)
   // On Windows, the importer's DetectIEProfiles() will always add to the count.
@@ -152,7 +156,6 @@ int MaskExpectedImportState(int expected_import_state) {
 #endif
   if (source_profile_count == 0)
     return expected_import_state & ~first_run::AUTO_IMPORT_PROFILE_IMPORTED;
-
   return expected_import_state;
 }
 
@@ -289,6 +292,8 @@ INSTANTIATE_TEST_CASE_P(
         chrome_prefs::internals::kSettingsEnforcementGroupEnforceOnload,
         chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways,
         chrome_prefs::internals::
-            kSettingsEnforcementGroupEnforceAlwaysWithExtensions));
+            kSettingsEnforcementGroupEnforceAlwaysWithExtensions,
+        chrome_prefs::internals::
+            kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE));
 
 #endif  // !defined(OS_CHROMEOS)