[Signin] Rename obfuscated_gaia_id into gaia_id

components/signin/core/browser/signin_header_helper_unittest.cc

 // Copyright 2016 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/core/browser/signin_header_helper.h"
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 225 matching lines @@
 }
 
 TEST_F(SigninHeaderHelperTest, TestDiceInvalidResponseParams) {
   DiceResponseParams params = BuildDiceResponseParams("blah");
   EXPECT_EQ(DiceAction::NONE, params.user_intention);
 }
 
 TEST_F(SigninHeaderHelperTest, TestBuildDiceResponseParams) {
   const char kAuthorizationCode[] = "authorization_code";
   const char kEmail[] = "foo@example.com";
-  const char kObfuscatedGaiaID[] = "obfuscated_gaia_id";
+  const char kGaiaID[] = "gaia_id";
   const int kSessionIndex = 42;
 
   {
     // Signin response.
     DiceResponseParams params = BuildDiceResponseParams(base::StringPrintf(
         "action=SIGNIN,id=%s,email=%s,authuser=%i,authorization_code=%s",
-        kObfuscatedGaiaID, kEmail, kSessionIndex, kAuthorizationCode));
+        kGaiaID, kEmail, kSessionIndex, kAuthorizationCode));
     EXPECT_EQ(DiceAction::SIGNIN, params.user_intention);
-    EXPECT_EQ(kObfuscatedGaiaID, params.obfuscated_gaia_id);
+    EXPECT_EQ(kGaiaID, params.gaia_id);
     EXPECT_EQ(kEmail, params.email);
     EXPECT_EQ(kSessionIndex, params.session_index);
     EXPECT_EQ(kAuthorizationCode, params.authorization_code);
   }
 
   {
     // Signout response.
     DiceResponseParams params = BuildDiceResponseParams(
-        base::StringPrintf("action=SIGNOUT,id=%s,email=%s,authuser=%i",
-                           kObfuscatedGaiaID, kEmail, kSessionIndex));
+        base::StringPrintf("action=SIGNOUT,id=%s,email=%s,authuser=%i", kGaiaID,
+                           kEmail, kSessionIndex));
     EXPECT_EQ(DiceAction::SIGNOUT, params.user_intention);
-    EXPECT_EQ(kObfuscatedGaiaID, params.obfuscated_gaia_id);
+    EXPECT_EQ(kGaiaID, params.gaia_id);
     EXPECT_EQ(kEmail, params.email);
     EXPECT_EQ(kSessionIndex, params.session_index);
     EXPECT_EQ("", params.authorization_code);
   }
 
   {
     // Missing authorization code.
     DiceResponseParams params = BuildDiceResponseParams(
-        base::StringPrintf("action=SIGNIN,id=%s,email=%s,authuser=%i",
-                           kObfuscatedGaiaID, kEmail, kSessionIndex));
+        base::StringPrintf("action=SIGNIN,id=%s,email=%s,authuser=%i", kGaiaID,
+                           kEmail, kSessionIndex));
     EXPECT_EQ(DiceAction::NONE, params.user_intention);
   }
 
   {
     // Missing non-optional field (email).
     DiceResponseParams params = BuildDiceResponseParams(base::StringPrintf(
-        "action=SIGNIN,id=%s,authuser=%i,authorization_code=%s",
-        kObfuscatedGaiaID, kSessionIndex, kAuthorizationCode));
+        "action=SIGNIN,id=%s,authuser=%i,authorization_code=%s", kGaiaID,
+        kSessionIndex, kAuthorizationCode));
     EXPECT_EQ(DiceAction::NONE, params.user_intention);
   }
 }
 
 #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
 
 // Tests that the Mirror header request is returned normally when the redirect
 // URL is eligible.
 TEST_F(SigninHeaderHelperTest, TestMirrorHeaderEligibleRedirectURL) {
   switches::EnableAccountConsistencyMirrorForTesting(
@@ skipping 65 matching lines @@
       "action=REAUTH,email=%s,is_saml=true,is_same_tab=true,continue_url=%s",
       kEmail, kContinueURL));
   EXPECT_EQ(GAIA_SERVICE_TYPE_REAUTH, params.service_type);
   EXPECT_EQ(kEmail, params.email);
   EXPECT_EQ(true, params.is_saml);
   EXPECT_EQ(true, params.is_same_tab);
   EXPECT_EQ(GURL(kContinueURL), params.continue_url);
 }
 
 }  // namespace signin