Gender-neutralize a few more comments / strings.

BUG=none
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2065373002
Cr-Commit-Position: refs/heads/master@{#399889}

chrome/app/bookmarks_strings.grdp

@@ -318,7 +318,7 @@
       Search
     </message>
   </if>
-  <message name="IDS_EXPORT_BOOKMARKS_DEFAULT_FILENAME" desc="Filename that pre-populates the filename field when user attempts to export his bookmarks from Bookmark Manager.">
+  <message name="IDS_EXPORT_BOOKMARKS_DEFAULT_FILENAME" desc="Filename that pre-populates the filename field when user attempts to export their bookmarks from Bookmark Manager.">
     bookmarks_<ph name="DATESTAMP">$1<ex>02_11_11</ex></ph>.html
   </message>
   <!-- End of Bookmarks Manager strings. -->

chrome/app/chromeos_strings.grdp

@@ -1691,7 +1691,7 @@ Press any key to continue exploring.
   <message name="IDS_LOGIN_FATAL_ERROR_TRY_AGAIN_BUTTON" desc="Label for a button which starts sign-in from the beginning after fatal error.">
     Try again
   </message>
-  <message name="IDS_LOGIN_SAML_INTERSTITIAL_MESSAGE" desc="Message to show on the SAML interstitial page to tell the user to continue signing in using his enterprise account.">
+  <message name="IDS_LOGIN_SAML_INTERSTITIAL_MESSAGE" desc="Message to show on the SAML interstitial page to tell the user to continue signing in using their enterprise account.">
     This device is managed by <ph name="BEGIN_BOLD">&lt;strong&gt;</ph><ph name="DOMAIN">$1<ex>acmecorp.com</ex></ph><ph name="END_BOLD">&lt;/strong&gt;</ph>.
     <ph name="LINE_BREAK">&lt;br/&gt;</ph>
     Please click "Next" to continue signing in to your <ph name="BEGIN_BOLD">&lt;strong&gt;</ph><ph name="DOMAIN">$1<ex>acmecorp.com</ex></ph><ph name="END_BOLD">&lt;/strong&gt;</ph> account.
@@ -2608,7 +2608,7 @@ Press any key to continue exploring.
   <message name="IDS_OPTIONS_CHANGE_PICTURE_CAPTION" desc="Caption on the user picture that user must click to change it, must be short.">
     Change
   </message>
-  <message name="IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TITLE" desc="Title of the dialog shown when user wants to change his/her picture.">
+  <message name="IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TITLE" desc="Title of the dialog shown when user wants to change their picture.">
     Change picture
   </message>
   <message name="IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT" desc="Text with description of what to do on Change picture dialog.">
@@ -2617,7 +2617,7 @@ Press any key to continue exploring.
   <message name="IDS_OPTIONS_CHANGE_PICTURE_CHOOSE_FILE" desc="Text on a button that shows file dialog to choose a picture from file.">
     Choose a file
   </message>
-  <message name="IDS_OPTIONS_CROP_IMAGE_DIALOG_TITLE" desc="Title of the dialog shown when user wants to crop his/her picture.">
+  <message name="IDS_OPTIONS_CROP_IMAGE_DIALOG_TITLE" desc="Title of the dialog shown when user wants to crop their picture.">
     Crop image
   </message>
   <message name="IDS_OPTIONS_CROP_IMAGE_DIALOG_TEXT" desc="Text with description of what to do on Crop image dialog.">

chrome/browser/chromeos/file_manager/volume_manager.cc

@@ -676,7 +676,7 @@ void VolumeManager::OnProvidedFileSystemUnmount(
 
 void VolumeManager::OnExternalStorageDisabledChanged() {
   // If the policy just got disabled we have to unmount every device currently
-  // mounted. The opposite is fine - we can let the user re-plug her device to
+  // mounted. The opposite is fine - we can let the user re-plug their device to
   // make it available.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
     // We do not iterate on mount_points directly, because mount_points can

chrome/browser/resources/chromeos/login/saml_interstitial.html

@@ -21,7 +21,7 @@
 Events:
   'samlPageNextClicked' - Fired when the "Next" button is clicked indicating
                           that the user would like to proceed with
-                          authentication via his enrollement SAML IdP.
+                          authentication via their enrollement SAML IdP.
   'samlPageChangeAccountClicked' - Fired when the user clicks the sign in with
                                    a differnt account link. GAIA Minute Maid
                                    screen will be shown.

chrome/browser/shell_integration_linux.cc

@@ -334,7 +334,7 @@ bool CreateShortcutOnDesktop(const base::FilePath& shortcut_filename,
     // Delete the file. No shortuct is better than corrupted one. Use unlinkat
     // to make sure we're deleting the file in the directory we think we are.
     // Even if an attacker manager to put something other at
-    // |shortcut_filename| we'll just undo his action.
+    // |shortcut_filename| we'll just undo their action.
     unlinkat(desktop_fd, shortcut_filename.value().c_str(), 0);
   }
 

chrome/browser/ui/views/passwords/manage_password_items_view.h

@@ -17,7 +17,7 @@ class ManagePasswordsBubbleModel;
 // A custom view of individual credentials. The view is represented as a table
 // where each row can be in three distinct states:
 //
-// * Present credentials to the user which she may choose to save.
+// * Present credentials the user may choose to save.
 // * Present already-saved credentials to the user for management.
 // * Offer the user the ability to undo a deletion action.
 class ManagePasswordItemsView : public views::View {

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

@@ -375,7 +375,7 @@ void ManagePasswordsBubbleView::PendingView::StyledLabelLinkClicked(
 
 // ManagePasswordsBubbleView::ManageView --------------------------------------
 
-// A view offering the user a list of her currently saved credentials
+// A view offering the user a list of their currently saved credentials
 // for the current page, along with a "Manage passwords" link and a
 // "Done" button.
 class ManagePasswordsBubbleView::ManageView : public views::View,

components/autofill/core/browser/autofill_metrics.h

@@ -407,13 +407,13 @@ class AutofillMetrics {
     // User chose to opt in (checked the checkbox when it was empty).
     // Only logged if there was an attempt to unmask.
     UNMASK_PROMPT_LOCAL_SAVE_DID_OPT_IN,
-    // User did not opt in when he had the chance (left the checkbox unchecked).
-    // Only logged if there was an attempt to unmask.
+    // User did not opt in when they had the chance (left the checkbox
+    // unchecked).  Only logged if there was an attempt to unmask.
     UNMASK_PROMPT_LOCAL_SAVE_DID_NOT_OPT_IN,
     // User chose to opt out (unchecked the checkbox when it was check).
     // Only logged if there was an attempt to unmask.
     UNMASK_PROMPT_LOCAL_SAVE_DID_OPT_OUT,
-    // User did not opt out when he had a chance (left the checkbox checked).
+    // User did not opt out when they had a chance (left the checkbox checked).
     // Only logged if there was an attempt to unmask.
     UNMASK_PROMPT_LOCAL_SAVE_DID_NOT_OPT_OUT,
     // The prompt was closed while chrome was unmasking the card (user pressed

components/components_chromium_strings.grd

@@ -188,12 +188,12 @@
 
       <!-- About Flags UI -->
       <if expr="not chromeos">
-        <message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that he needs to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
+        <message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that they need to relaunch Chromium. Shown next to a button that says 'Relaunch Now'.">
           Your changes will take effect the next time you relaunch Chromium.
         </message>
       </if>
       <if expr="chromeos">
-        <message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that he needs to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
+        <message name="IDS_FLAGS_UI_RELAUNCH_NOTICE" desc="Notifies the user that they need to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
           Your changes will take effect the next time you restart your device.
         </message>
       </if>

components/data_reduction_proxy/core/browser/data_reduction_proxy_delegate_unittest.cc

@@ -362,7 +362,7 @@ TEST_F(DataReductionProxyDelegateTest, OnResolveProxyHandler) {
   OnResolveProxyHandler(url, "GET", load_flags, data_reduction_proxy_config,
                         empty_proxy_retry_info, config(), &result);
   EXPECT_EQ(data_reduction_proxy_info.proxy_server(), result.proxy_server());
-  // Only the proxy list should be updated, not he proxy info.
+  // Only the proxy list should be updated, not the proxy info.
   EXPECT_EQ(result.config_id(), prev_id);
 
   // A direct connection is used, but the data reduction proxy is on the retry

components/feedback/proto/web.proto

@@ -35,7 +35,7 @@ message WebData {
   //   no matching suggestions were found.
   // - NONE_OF_THE_ABOVE if the user has chosen "None of the above".
   // - Empty string if suggestions were shown but the user hasn't chosen
-  //   any of them (and also she hasn't chosen "None of the above").
+  //   any of them (and also they haven't chosen "None of the above").
   // - Actual suggestion identifier as returned from the server.
   optional string suggestion_id = 5;
 

components/metrics/proto/system_profile.proto

@@ -445,15 +445,15 @@ message SystemProfileProto {
     // Total amount of time that the program was running, in seconds,
     // since the last time a log was recorded, as measured using a client-side
     // clock implemented via TimeTicks, which guarantees that it is monotonic
-    // and does not jump if the user changes his/her clock.  The TimeTicks
+    // and does not jump if the user changes their clock.  The TimeTicks
     // implementation also makes the clock not count time the computer is
     // suspended.
     optional int64 incremental_uptime_sec = 1;
 
     // Total amount of time that the program was running, in seconds,
     // since startup, as measured using a client-side clock implemented
     // via TimeTicks, which guarantees that it is monotonic and does not
-    // jump if the user changes his/her clock.  The TimeTicks implementation
+    // jump if the user changes their clock.  The TimeTicks implementation
     // also makes the clock not count time the computer is suspended.
     // This field was added for M-35.
     optional int64 uptime_sec = 23;

components/omnibox/browser/autocomplete_match.h

@@ -275,8 +275,8 @@ struct AutocompleteMatch {
   // input.  Note that rare or unusual types that could be considered verbatim,
   // such as keyword engine matches or extension-provided matches, aren't
   // detected by this IsVerbatimType, as the user will not be able to infer
-  // what will happen when he or she presses enter in those cases if the match
-  // is not shown.
+  // what will happen when they press enter in those cases if the match is not
+  // shown.
   bool IsVerbatimType() const;
 
   // Returns whether this match or any duplicate of this match can be deleted.

components/omnibox/browser/in_memory_url_index.cc

@@ -177,7 +177,7 @@ void InMemoryURLIndex::OnURLsDeleted(history::HistoryService* history_service,
   // through an unclean shutdown (and therefore fail to write a new cache file),
   // when Chrome restarts and we restore from the previous cache, we'll end up
   // searching over URLs that may be deleted.  This would be wrong, and
-  // surprising to the user who bothered to delete some URLs from his/her
+  // surprising to the user who bothered to delete some URLs from their
   // history.  In this situation, deleting the cache is a better solution than
   // writing a new cache (after deleting the URLs from the in-memory structure)
   // because deleting the cache forces it to be rebuilt from history upon

components/omnibox/browser/omnibox_edit_model.cc

@@ -563,7 +563,7 @@ void OmniboxEditModel::AcceptInput(WindowOpenDisposition disposition,
   GURL alternate_nav_url;
   AutocompleteMatch match = CurrentMatch(&alternate_nav_url);
 
-  // If CTRL is down it means the user wants to append ".com" to the text he
+  // If CTRL is down it means the user wants to append ".com" to the text they
   // typed. If we can successfully generate a URL_WHAT_YOU_TYPED match doing
   // that, then we use this. These matches are marked as generated by the
   // HistoryURLProvider so we only generate them if this provider is present.

components/omnibox/browser/omnibox_edit_model.h

@@ -372,8 +372,8 @@ class OmniboxEditModel {
     DOWN_WITH_CHANGE,     // The control key is depressed, and the edit's
                           // contents/selection have changed since it was
                           // depressed.  If the user now hits enter, we assume
-                          // he simply hasn't released the key, rather than that
-                          // he intended to hit "ctrl-enter".
+                          // they simply haven't released the key, rather than
+                          // that they intended to hit "ctrl-enter".
   };
 
   // Returns true if a query to an autocomplete provider is currently

components/omnibox/browser/omnibox_log.h

@@ -75,7 +75,7 @@ struct OmniboxLog {
   base::TimeDelta elapsed_time_since_user_first_modified_omnibox;
 
   // The number of extra characters the user would have to manually type
-  // if she/he were not given the opportunity to select this match.  Only
+  // if they were not given the opportunity to select this match.  Only
   // set for matches that are allowed to be the default match (i.e., are
   // inlineable).  Set to base::string16::npos if the match is not allowed
   // to be the default match.

components/omnibox/browser/shortcuts_provider.cc

@@ -136,8 +136,8 @@ void ShortcutsProvider::DeleteMatch(const AutocompleteMatch& match) {
   GURL url(match.destination_url);
   DCHECK(url.is_valid());
 
-  // When a user deletes a match, he probably means for the URL to disappear out
-  // of history entirely. So nuke all shortcuts that map to this URL.
+  // When a user deletes a match, they probably mean for the URL to disappear
+  // out of history entirely. So nuke all shortcuts that map to this URL.
   scoped_refptr<ShortcutsBackend> backend =
       client_->GetShortcutsBackendIfExists();
   if (backend.get())  // Can be NULL in Incognito.

components/password_manager/core/browser/login_database_unittest.cc

@@ -292,7 +292,7 @@ TEST_F(LoginDatabaseTest, Logins) {
   EXPECT_EQ(1U, result.size());
   result.clear();
 
-  // User changes his password.
+  // User changes their password.
   PasswordForm form6(form5);
   form6.password_value = ASCIIToUTF16("test6");
   form6.preferred = true;

components/password_manager/core/browser/password_form_manager.h

@@ -285,15 +285,14 @@ class PasswordFormManager : public PasswordStoreConsumer {
     kManagerActionMax
   };
 
-  // UserAction - What does the user do with this form? If he or she
-  // does nothing (either by accepting what the password manager did, or
-  // by simply (not typing anything at all), you get None. If there were
-  // multiple choices and the user selects one other than the default,
-  // you get Choose, if user selects an entry from matching against the Public
-  // Suffix List you get ChoosePslMatch, if the user types in a new value
-  // for just the password you get OverridePassword, and if the user types in a
-  // new value for the username and password you get
-  // OverrideUsernameAndPassword.
+  // UserAction - What does the user do with this form? If they do nothing
+  // (either by accepting what the password manager did, or by simply (not
+  // typing anything at all), you get None. If there were multiple choices and
+  // the user selects one other than the default, you get Choose, if user
+  // selects an entry from matching against the Public Suffix List you get
+  // ChoosePslMatch, if the user types in a new value for just the password you
+  // get OverridePassword, and if the user types in a new value for the
+  // username and password you get OverrideUsernameAndPassword.
   enum UserAction {
     kUserActionNone = 0,
     kUserActionChoose,

components/policy/proto/device_management_backend.proto

@@ -261,7 +261,7 @@ message PolicyData {
 
   // The DM token that was used by the client in the HTTP POST header
   // for authenticating the request. It is included here again so that
-  // the client can verify that the response is meant for him (and not
+  // the client can verify that the response is meant for them (and not
   // issued by a replay or man-in-the-middle attack).
   optional string request_token = 3;