[signin] Add DICe flow for account consistency requests.

components/signin/ios/browser/account_consistency_service.mm

 // Copyright 2015 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 "components/signin/ios/browser/account_consistency_service.h"
 
 #import <WebKit/WebKit.h>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/signin/core/browser/account_reconcilor.h"
+#include "components/signin/core/browser/chrome_connected_header_helper.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/web_state/web_state_policy_decider.h"
 #include "ios/web/public/web_view_creation_util.h"
 #include "net/base/mac/url_conversions.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
 
 namespace {
@@ skipping 296 matching lines @@
   }
   applying_cookie_requests_ = true;
 
   const GURL url("https://" + cookie_requests_.front().domain);
   std::string cookie_value = "";
   // Expiration date of the cookie in the JavaScript convention of time, a
   // number of milliseconds since the epoch.
   double expiration_date = 0;
   switch (cookie_requests_.front().request_type) {
     case ADD_CHROME_CONNECTED_COOKIE:
-      cookie_value = signin::BuildMirrorRequestCookieIfPossible(
-          url, signin_manager_->GetAuthenticatedAccountInfo().gaia,
-          cookie_settings_.get(), signin::PROFILE_MODE_DEFAULT);
+      cookie_value =

[msarda, 2017/06/08 23:43:05]

Let's avoid this change as explained previously.

+          signin::ChromeConnectedHeaderHelper::BuildRequestCookieIfPossible(
+              url, signin_manager_->GetAuthenticatedAccountInfo().gaia,
+              cookie_settings_.get(), signin::PROFILE_MODE_DEFAULT);
       if (cookie_value.empty()) {
         // Don't add the cookie. Tentatively correct |last_cookie_update_map_|.
         last_cookie_update_map_.erase(cookie_requests_.front().domain);
         FinishedApplyingCookieRequest(false);
         return;
       }
       // Create expiration date of Now+2y to roughly follow the APISID cookie.
       expiration_date =
           (base::Time::Now() + base::TimeDelta::FromDays(730)).ToJsTime();
       break;
@@ skipping 126 matching lines @@
   // |browser_state_| is now active. There might be some pending cookie requests
   // to apply.
   ApplyCookieRequests();
 }
 
 void AccountConsistencyService::OnInactive() {
   // |browser_state_| is now inactive. Stop using |web_view_| and don't create
   // a new one until it is active.
   ResetWKWebView();
 }