[signin] Enable Dice Milestone 3 by default

Bug: 807826
Change-Id: I77fc0e169536f86637f7501a6100566a50630f55
Reviewed-on: https://chromium-review.googlesource.com/1177708Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583988}

chrome/browser/signin/account_consistency_mode_manager.cc

@@ -20,10 +20,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/google_api_keys.h"
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-#include "ui/base/ui_base_features.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "components/signin/core/browser/signin_pref_names.h"
 #endif
@@ -255,13 +251,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
 #endif
 
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
-  AccountConsistencyMethod method =
-      AccountConsistencyMethod::kDicePrepareMigration;
-
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-  if (base::FeatureList::IsEnabled(features::kExperimentalUi))
-    method = AccountConsistencyMethod::kDiceMigration;
-#endif
+  AccountConsistencyMethod method = AccountConsistencyMethod::kDiceMigration;
 
   if (method_value == kAccountConsistencyFeatureMethodDiceFixAuthErrors)
     method = AccountConsistencyMethod::kDiceFixAuthErrors;

chrome/browser/signin/account_consistency_mode_manager_unittest.cc

@@ -36,7 +36,7 @@ TEST(AccountConsistencyModeManagerTest, DefaultValue) {
   EXPECT_EQ(signin::AccountConsistencyMethod::kMirror,
             AccountConsistencyModeManager::GetMethodForProfile(&profile));
 #elif BUILDFLAG(ENABLE_DICE_SUPPORT)
-  EXPECT_EQ(signin::AccountConsistencyMethod::kDicePrepareMigration,
+  EXPECT_EQ(signin::AccountConsistencyMethod::kDiceMigration,
             AccountConsistencyModeManager::GetMethodForProfile(&profile));
 #else
   EXPECT_EQ(signin::AccountConsistencyMethod::kDisabled,