Update the string for gaia incognito header

chrome/browser/signin/signin_header_helper.cc

 // Copyright 2013 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/signin/signin_header_helper.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 21 matching lines @@
 const char kChromeManageAccountsHeader[] = "X-Chrome-Manage-Accounts";
 const char kGaiaIdAttrName[] = "id";
 const char kProfileModeAttrName[] = "mode";
 const char kEnableAccountConsistencyAttrName[] = "enable_account_consistency";
 
 // Determine the service type that has been passed from GAIA in the header.
 signin::GAIAServiceType GetGAIAServiceTypeFromHeader(
     const std::string& header_value) {
   if (header_value == "SIGNOUT")
     return signin::GAIA_SERVICE_TYPE_SIGNOUT;
-  else if (header_value == "SIGNOUTOPTIONS_INCOGNITO")
-    return signin::GAIA_SERVICE_TYPE_SIGNOUTOPTIONS_INCOGNITO;
+  else if (header_value == "INCOGNITO")
+    return signin::GAIA_SERVICE_TYPE_INCOGNITO;
   else if (header_value == "ADDSESSION")
     return signin::GAIA_SERVICE_TYPE_ADDSESSION;
   else if (header_value == "REAUTH")
     return signin::GAIA_SERVICE_TYPE_REAUTH;
   else if (header_value == "DEFAULT")
     return signin::GAIA_SERVICE_TYPE_DEFAULT;
   else
     return signin::GAIA_SERVICE_TYPE_NONE;
 }
 
 // Processes the mirror response header on the UI thread. Currently depending
 // on the value of |header_value|, it either shows the profile avatar menu, or
 // opens an incognito window/tab.
 void ProcessMirrorHeaderUIThread(
     int child_id, int route_id, const std::string& header_value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(child_id, route_id);
   if (!web_contents)
     return;
 
   signin::GAIAServiceType service_type =
       GetGAIAServiceTypeFromHeader(header_value);
 
 #if !defined(OS_ANDROID)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (browser) {
-    if (service_type == signin::GAIA_SERVICE_TYPE_SIGNOUTOPTIONS_INCOGNITO) {
+    if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) {
       chrome::NewIncognitoWindow(browser);
     } else {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
           service_type);
     }
   }
 #else  // defined(OS_ANDROID)
-  if (service_type == signin::GAIA_SERVICE_TYPE_SIGNOUTOPTIONS_INCOGNITO) {
+  if (service_type == signin::GAIA_SERVICE_TYPE_INCOGNITO) {
     web_contents->OpenURL(content::OpenURLParams(
         GURL(chrome::kChromeUINativeNewTabURL), content::Referrer(),
         OFF_THE_RECORD, content::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
   } else {
     // TODO(mlerman): pass service_type to android logic for UMA metrics
     // that will eventually be installed there.
     AccountManagementScreenHelper::OpenAccountManagementScreen(
         Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   }
 #endif // OS_ANDROID
@@ skipping 78 matching lines @@
     DCHECK(switches::IsNewProfileManagement() &&
            !io_data->IsOffTheRecord());
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id,
                    header_value));
   }
 }
 
 } // namespace signin