[dice] Enable Desktop Identity Consistency M2 for tests

This CL enables Dice M2 by default in Chromium that have API keys
configured as those are mandatory for DICE.

It also ensures that unit and browser tests have DICE M2 enabled,
even for builds when the API keys are not configured.

Bug: 829220
Change-Id: I752bf7e9e03da0ddd33841e42ec1c550fcaf91c7
Reviewed-on: https://chromium-review.googlesource.com/1044210
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556057}

chrome/browser/signin/account_consistency_mode_manager.cc

@@ -15,6 +15,7 @@
 #include "components/signin/core/browser/signin_pref_names.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "google_apis/google_api_keys.h"
 
 namespace {
 
@@ -83,6 +84,8 @@ signin::AccountConsistencyMethod GetMethodForNonRegularProfile() {
 
 }  // namespace
 
+bool AccountConsistencyModeManager::ignore_missing_key_for_testing_ = false;
+
 // static
 AccountConsistencyModeManager* AccountConsistencyModeManager::GetForProfile(
     Profile* profile) {
@@ -179,6 +182,11 @@ bool AccountConsistencyModeManager::IsMirrorEnabledForProfile(
          signin::AccountConsistencyMethod::kMirror;
 }
 
+// static
+void AccountConsistencyModeManager::SetIgnoreMissingApiKeysForTesting() {
+  ignore_missing_key_for_testing_ = true;
+}
+
 signin::AccountConsistencyMethod
 AccountConsistencyModeManager::GetAccountConsistencyMethod() {
   if (profile_->GetProfileType() != Profile::ProfileType::REGULAR_PROFILE) {
@@ -200,13 +208,26 @@ AccountConsistencyModeManager::GetAccountConsistencyMethod() {
   signin::AccountConsistencyMethod method =
       signin::GetAccountConsistencyMethod();
 
+  if (method == signin::AccountConsistencyMethod::kMirror ||
+      signin::DiceMethodGreaterOrEqual(
+          signin::AccountConsistencyMethod::kDiceFixAuthErrors, method)) {
+    return method;
+  }
+
+  DCHECK(signin::DiceMethodGreaterOrEqual(
+      method, signin::AccountConsistencyMethod::kDicePrepareMigration));
+
   // Legacy supervised users cannot get Dice.
   // TODO(droger): remove this once legacy supervised users are no longer
   // supported.
-  if (profile_->IsLegacySupervised() &&
-      (method != signin::AccountConsistencyMethod::kMirror) &&
-      signin::DiceMethodGreaterOrEqual(
-          method, signin::AccountConsistencyMethod::kDiceFixAuthErrors)) {
+  if (profile_->IsLegacySupervised())
+    return signin::AccountConsistencyMethod::kDiceFixAuthErrors;
+
+  bool can_enable_dice_for_build =
+      ignore_missing_key_for_testing_ || google_apis::HasKeysConfigured();
+  if (!can_enable_dice_for_build) {
+    LOG(WARNING) << "Desktop Identity Consistency cannot be enabled as no "
+                    "API keys have been configured.";
     return signin::AccountConsistencyMethod::kDiceFixAuthErrors;
   }
 

chrome/browser/signin/account_consistency_mode_manager.h

@@ -58,6 +58,10 @@ class AccountConsistencyModeManager : public KeyedService {
   // behaviour enabled.
   static bool IsMirrorEnabledForProfile(Profile* profile);
 
+  // By default, Deskotp Identity Consistency (aka Dice) is not enabled in
+  // builds lacking an API key. For testing, set to have Dice enabled in tests.
+  static void SetIgnoreMissingApiKeysForTesting();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(AccountConsistencyModeManagerTest,
                            MigrateAtCreation);
@@ -76,6 +80,10 @@ class AccountConsistencyModeManager : public KeyedService {
 
   Profile* profile_;
 
+  // By default, DICE is not enabled in builds lacking an API key. Set to true
+  // for tests.
+  static bool ignore_missing_key_for_testing_;
+
   DISALLOW_COPY_AND_ASSIGN(AccountConsistencyModeManager);
 };
 

chrome/test/base/chrome_test_suite.cc

@@ -16,6 +16,7 @@
 #include "build/build_config.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/signin/account_consistency_mode_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
@@ -86,6 +87,12 @@ void ChromeTestSuite::Initialize() {
       ChromeMainDelegate::kNonWildcardDomainNonPortSchemes,
       ChromeMainDelegate::kNonWildcardDomainNonPortSchemesSize);
 
+  // Desktop Identity Consistency (a.k.a. DICE) requires API keys to be
+  // configured as they are needed for regular web sign-in flows to Google.
+  // Ignore this requiement for unit and browser tests to make sure that the
+  // DICE feature gets the right test coverage.
+  AccountConsistencyModeManager::SetIgnoreMissingApiKeysForTesting();
+
 #if defined(OS_MACOSX)
   // Look in the framework bundle for resources.
   base::FilePath path;

testing/variations/fieldtrial_testing_config.json

@@ -8,9 +8,9 @@
             ],
             "experiments": [
                 {
-                    "name": "DiceFixAuthErrors",
+                    "name": "DicePrepareMigration",
                     "params": {
-                        "method": "dice_fix_auth_errors"
+                        "method": "dice_prepare_migration_new_endpoint"
                     },
                     "enable_features": [
                         "AccountConsistency"