Pref service: enable for user prefs in chrome behind a flag.

chrome/browser/profiles/profile_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 "chrome/browser/profiles/profile.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 13 matching lines @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/browser/startup_task_runner_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 639 matching lines @@
   }
 #endif
 
   // This retry loop reduces flakiness due to the fact that this ultimately
   // tests whether or not a code path hits a timed wait.
   bool succeeded = false;
   for (size_t retries = 0; !succeeded && retries < 3; ++retries) {
     // Flush the profile data to disk for all loaded profiles.
     profile->SetExitType(Profile::EXIT_CRASHED);
     profile->GetPrefs()->CommitPendingWrite();
+    if (base::FeatureList::IsEnabled(features::kPrefService)) {
+      FlushTaskRunner(content::BrowserThread::GetTaskRunnerForThread(
+                          content::BrowserThread::IO)
+                          .get());
+    }
     FlushTaskRunner(profile->GetIOTaskRunner().get());
 
     // Make sure that the prefs file was written with the expected key/value.
     ASSERT_EQ(GetExitTypePreferenceFromDisk(profile), "Crashed");
 
     // The blocking wait in EndSession has a timeout.
     base::Time start = base::Time::Now();
 
     // This must not return until the profile data has been written to disk.
     // If this test flakes, then logoff on Windows has broken again.
@@ skipping 156 matching lines @@
       base::Bind(&SendReportHttpResponse, embedded_test_server()->base_url()));
   ASSERT_TRUE(hpkp_test_server.Start());
 
   // To send a report, must use a non-numeric host name for the original
   // request.  This must not match the host name of the server that reports are
   // sent to.
   ui_test_utils::NavigateToURL(browser(),
                                hpkp_test_server.GetURL("localhost", "/"));
   wait_for_report_loop.Run();
 }