Add new flag for consistent identity.

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
 This file contains definitions of resources that will be translated for each
 locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 13395 matching lines @@
     </message>
     <message name="IDS_DARK_THEME"
              desc="The title of a link that will open the Chrome Web Store with a dark theme the user might want to install, if they prefer light text on a dark background.">
       Dark Theme
     </message>
 
     <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME" desc="Title for the flag to enable the new profile management.">
       Enable new profile management system
     </message>
     <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION" desc="Description for the flag to enable the new profile management">
-      Enables the new profile management system, including profile sign-out and the new avatar menu UI.
+      Enables the new profile management system, including profile lock and the new avatar menu UI.
+    </message>
+    <message name="IDS_FLAGS_ENABLE_CONSISTENT_IDENTITY_NAME" desc="Title for the flag to enable the new profile management.">

[guohui, 2014/05/28 18:27:23]

nits: we have already agreed with gaia to use the name
'enable_account_consistency', while i actually like this name better, i think we
should be consistent. And this applies to every name containing
"consistent_identity" in other files.

[Roger Tawa OOO till Jul 10th, 2014/05/29 01:23:12]

Done.

+      Enable identity consistency between browser and cookie jar
+    </message>
+    <message name="IDS_FLAGS_ENABLE_CONSISTENT_IDENTITY_DESCRIPTION" desc="Description for the flag to enable the new profile management">
+      When enabled, the browser manages signing in and out of Google accounts.
     </message>
     <message name="IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME" desc="Title for the flag to enable fast user switching.">
       Enable fast user switching in the avatar menu
     </message>
     <message name="IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_DESCRIPTION" desc="Description for the flag to enable fast user switching">
       Enables fast switching between users in the avatar menu.
     </message>
     <message name="IDS_FLAGS_ENABLE_NEW_AVATAR_MENU_NAME" desc="Title for the flag to enable the new avatar menu.">
       Enable the new avatar menu
     </message>
@@ skipping 723 matching lines @@
     <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Description of the 'Extension Content Verification' enforce mode">
       Enforce (try to get hashes, and enforce them if successful)
     </message>
 
     <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc="Description of the 'Extension Content Verification' enforce strict mode">
       Enforce strict (hard fail if we can't get hashes)
     </message>
   </messages>
   </release>
 </grit>