Remove pp_ifdef from resource files in chrome/browser and chrome/renderer.

chrome/browser/resources/options/browser_options.html

 <div id="settings" class="page" hidden>
   <header>
     <h1 i18n-content="settingsTitle"></h1>
   </header>
   <include src="reset_profile_settings_banner.html">
   <include src="automatic_settings_reset_banner.html">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <include src="secondary_user_banner.html">
   <section>
     <div id="network-section-header" class="section-header">
       <h3 i18n-content="sectionTitleInternet"></h3>
       <span class="controlled-setting-indicator" plural></span>
     </div>
     <div id="network-settings">
       <list id="network-list"></list>
       <div id="shared-proxies" class="checkbox">
         <label>
           <input id="use-shared-proxies" type="checkbox"
               pref="settings.use_shared_proxies">
           <span i18n-content="useSharedProxies"></span>
         </label>
       </div>
       <div id="network-menus"></div>
     </div>
   </section>
 </if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
   <include src="sync_section.html">
   <include src="startup_section.html">
 </if>
   <section>
     <h3 i18n-content="sectionTitleAppearance"></h3>
     <div class="settings-row">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
       <button id="set-wallpaper" i18n-content="setWallpaper"
           guest-visibility="disabled"></button>
 </if>
-<if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx">
+<if expr="not chromeos and is_posix and not is_macosx">
       <button id="themes-gallery" i18n-content="themesGallery"></button>
       <button id="themes-native-button"
           i18n-content="themesNativeButton"></button>
       <button id="themes-reset"
           i18n-content="themesSetClassic"></button>
 </if>
-<if expr="pp_ifdef('chromeos') or is_win or is_macosx">
+<if expr="chromeos or is_win or is_macosx">
       <button id="themes-gallery" i18n-content="themesGallery"></button>
       <button id="themes-reset" i18n-content="themesReset"></button>
 </if>
     </div>
     <div class="checkbox" guest-visibility="disabled">
       <span class="controlled-setting-with-label">
         <input id="show-home-button" type="checkbox"
             pref="browser.show_home_button"
             metric="Options_Homepage_HomeButton">
         <span>
@@ skipping 22 matching lines @@
         <span>
           <label for="show-bookmark-bars"
               i18n-content="toolbarShowBookmarksBar">
           </label>
           <span class="controlled-setting-indicator"
               pref="bookmark_bar.show_on_all_tabs">
           </span>
         </span>
       </span>
     </div>
-<if expr="is_posix and not pp_ifdef('chromeos') and not is_macosx">
+<if expr="is_posix and not chromeos and not is_macosx">
     <div class="checkbox"><label>
         <input id="show-window-decorations" type="checkbox"
             pref="browser.custom_chrome_frame" metric="Options_CustomFrame"
             inverted_pref>
         <span i18n-content="showWindowDecorations"></span>
     </label></div>
 </if>
   </section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <section>
     <h3 i18n-content="sectionTitleDevice"></h3>
     <div>
       <span i18n-content="deviceGroupDescription"></span>
       <div id="touchpad-settings" class="settings-row" hidden>
         <span class="option-name" i18n-content="touchpadSpeed"></span>
         <input id="sensitivity-range" type="range" min="1" max="5"
             pref="settings.touchpad.sensitivity2" class="touch-slider">
       </div>
       <div id="mouse-settings" class="settings-row" hidden>
@@ skipping 30 matching lines @@
               pref="default_search_provider.enabled">
           </span>
           <button id="manage-default-search-engines"
               i18n-content="defaultSearchManageEngines">
           </button>
         </div>
       </div>
   </section>
   <section id="sync-users-section" guest-visibility="hidden">
     <h3 i18n-content="sectionTitleUsers"></h3>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
     <include src="sync_section.html">
 </if>
     <div id="profiles-section" hidden>
       <list id="profiles-list" class="settings-list" hidden></list>
       <div id="profiles-single-message" class="settings-row"
           i18n-content="profilesSingleUser">
       </div>
       <div id="profiles-buttons">
         <button id="profiles-create" i18n-content="profilesCreate"></button>
-<if expr="pp_ifdef('enable_settings_app')">
+<if expr="enable_settings_app">
         <button id="profiles-app-list-switch"
             i18n-content="profilesAppListSwitch" hidden>
         </button>
 </if>
         <button id="profiles-manage" i18n-content="profilesManage" disabled>
         </button>
         <button id="profiles-delete" i18n-content="profilesDelete"></button>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
         <button id="import-data" i18n-content="importData"></button>
 </if>
       </div>
     </div>
     <div id="profiles-supervised-dashboard-tip"
         i18n-values=".innerHTML:profilesSupervisedDashboardTip" hidden>
     </div>
   </section>
   <section id="set-default-browser-section">
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
     <h3 i18n-content="sectionTitleDefaultBrowser"></h3>
     <div>
       <button id="set-as-default-browser"
           i18n-content="defaultBrowserUseAsDefault" hidden>
       </button>
       <div id="default-browser-state" i18n-content="defaultBrowserUnknown">
       </div>
       <div id="auto-launch-option" class="checkbox" hidden>
         <label id="auto-launch-label">
           <input id="auto-launch" type="checkbox">
           <span i18n-content="autoLaunchText"></span>
         </label>
       </div>
     </div>
-</if>  <!-- not pp_ifdef('chromeos') -->
+</if>  <!-- not chromeos -->
   </section>
 <div id="advanced-settings" hidden>
 <div id="advanced-settings-container">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <section>
     <h3 i18n-content="datetimeTitle"></h3>
     <div class="option-control-table">
       <div guest-visibility="disabled">
         <label for="timezone-select" class="option-name"
             i18n-content="timezone"></label>
         <div id="timezone-value">
           <select id="timezone-select" class="control"
               i18n-options="timezoneList" data-type="string"
               pref="cros.system.timezone">
@@ skipping 90 matching lines @@
           <span>
             <label for="safeBrowsingEnabled"
                 i18n-content="safeBrowsingEnableProtection">
             </label>
             <span class="controlled-setting-indicator"
                 pref="safebrowsing.enabled">
             </span>
           </span>
         </span>
       </div>
-<if expr="pp_ifdef('_google_chrome')">
+<if expr="_google_chrome">
       <div class="checkbox">
         <span class="controlled-setting-with-label">
           <input id="spelling-enabled-control" type="checkbox"
               pref="spellcheck.use_spelling_service" dialog-pref>
           <span>
             <label for="spelling-enabled-control" i18n-content="spellingPref">
             </label>
             <span id="spelling-enabled-indicator"
                 class="controlled-setting-indicator"
                 pref="spellcheck.use_spelling_service" dialog-pref>
             </span>
           </span>
         </span>
       </div>
       <div id="metricsReportingSetting" class="checkbox">
         <span class="controlled-setting-with-label">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
           <input id="metricsReportingEnabled"
               pref="cros.metrics.reportingEnabled" type="checkbox">
           <span>
             <label for="metricsReportingEnabled" i18n-content="enableLogging">
             </label>
             <span class="controlled-setting-indicator"
                 pref="cros.metrics.reportingEnabled">
             </span>
           </span>
 </if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
           <input id="metricsReportingEnabled"
               pref="user_experience_metrics.reporting_enabled" type="checkbox">
           <span>
             <label for="metricsReportingEnabled" i18n-content="enableLogging">
             </label>
             <span class="controlled-setting-indicator"
                 pref="user_experience_metrics.reporting_enabled">
             </span>
           </span>
 </if>
         </span>
       </div>
-</if>  <!-- pp_ifdef('_google_chrome') -->
+</if>  <!-- _google_chrome -->
       <div class="checkbox">
         <label>
           <input id="do-not-track-enabled" pref="enable_do_not_track"
               metric="Options_DoNotTrackCheckbox" type="checkbox" dialog-pref>
           <span i18n-content="doNotTrack"></span>
         </label>
       </div>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
       <div class="checkbox">
         <span class="controlled-setting-with-label">
           <input id="content-protection-attestation-enabled" type="checkbox"
               pref="cros.device.attestation_for_content_protection_enabled">
           <span>
             <label for="content-protection-attestation-enabled"
                 i18n-content="enableContentProtectionAttestation">
             </label>
             <a target="_blank" i18n-content="learnMore"
                 i18n-values="href:contentProtectionAttestationLearnMoreURL">
@@ skipping 22 matching lines @@
               </label>
               <span class="controlled-setting-indicator"
                   pref="hotword.search_enabled" dialog-pref>
               </span>
             </span>
           </span>
         </div>
       </div>
     </div>
   </section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <!-- By default, the bluetooth section is hidden.  It is only visible if a
        bluetooth adapter is discovered -->
   <section id="bluetooth-devices" hidden>
     <h3 i18n-content="bluetooth"></h3>
     <div id="bluetooth-options-div">
       <div class="checkbox">
         <label>
           <input type="checkbox" id="enable-bluetooth">
           <span i18n-content="enableBluetooth">
         </label>
       </div>
       <div class="settings-list bluetooth-device-list" hidden>
         <list id="bluetooth-paired-devices-list"></list>
         <div id="bluetooth-paired-devices-list-empty-placeholder"
             class="bluetooth-empty-list-label" hidden>
           <span i18n-content="bluetoothNoDevices"></span>
         </div>
       </div>
       <div id="bluetooth-button-group">
         <button id="bluetooth-add-device"
             i18n-content="addBluetoothDevice" hidden></button>
         <button id="bluetooth-reconnect-device"
             i18n-content="bluetoothConnectDevice" disabled hidden></button>
       </div>
     </div>
   </section>
-</if>  <!-- pp_ifdef('chromeos') -->
+</if>  <!-- chromeos -->
   <section id="passwords-and-autofill-section">
     <h3 i18n-content="passwordsAndAutofillGroupName"></h3>
     <div class="checkbox">
       <span class="controlled-setting-with-label">
         <input id="autofill-enabled" pref="autofill.enabled"
             metric="Options_FormAutofill" type="checkbox">
         <span>
           <label for="autofill-enabled" i18n-content="autofillEnabled"></label>
           <span class="controlled-setting-indicator" pref="autofill.enabled">
           </span>
@@ skipping 57 matching lines @@
       <div class="checkbox">
         <label>
           <input id="tabsToLinksPref" pref="webkit.webprefs.tabs_to_links"
               metric="Options_TabsToLinks" type="checkbox">
           <span i18n-content="tabsToLinksPref"></span>
         </label>
       </div>
 </if>
     </div>
   </section>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
   <section id="network-section">
     <h3 i18n-content="advancedSectionTitleNetwork"></h3>
     <div>
       <span id="proxiesLabel" class="settings-row"></span>
       <div class="settings-row">
         <button id="proxiesConfigureButton"
             i18n-content="proxiesConfigureButton"></button>
         <span class="controlled-setting-indicator" pref="proxy" plural></span>
       </div>
     </div>
@@ skipping 51 matching lines @@
           <span>
             <label for="prompt-for-download"
                 i18n-content="downloadLocationAskForSaveLocation">
             </label>
             <span class="controlled-setting-indicator"
                 pref="download.prompt_for_download">
             </span>
           </span>
         </span>
       </div>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
       <div class="checkbox" id="disable-drive-row" guest-visibility="disabled">
         <span class="controlled-setting-with-label">
           <input id="drive-disabled" type="checkbox"
               pref="gdata.disabled"
               metric="Options_DisableGData">
           <span>
             <label for="drive-disabled" i18n-content="disableGData"></label>
             <span class="controlled-setting-indicator" pref="gdata.disabled">
             </span>
           </span>
         </span>
       </div>
 </if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
       <div id="auto-open-file-types-section" hidden>
         <div id="auto-open-file-types-container">
           <div id="auto-open-file-types-label"
               i18n-content="autoOpenFileTypesInfo"></div>
           <button id="autoOpenFileTypesResetToDefault"
               i18n-content="autoOpenFileTypesResetToDefault"></button>
         </div>
       </div>
 </if>
     </div>
   </section>
   <section>
       <h3 i18n-content="advancedSectionTitleSecurity"></h3>
       <div>
-<if expr="pp_ifdef('use_nss') or is_win or is_macosx">
+<if expr="use_nss or is_win or is_macosx">
         <div class="settings-row">
           <button id="certificatesManageButton"
               i18n-content="certificatesManageButton"></button>
         </div>
 </if>
         <div class="checkbox">
           <label>
             <input id="sslCheckRevocation" pref="ssl.rev_checking.enabled"
                    type="checkbox">
             <span i18n-content="sslCheckRevocation"></span>
           </label>
         </div>
       </div>
   </section>
   <section id="cloud-print-connector-section">
     <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
-<if expr="pp_ifdef('enable_mdns')">
+<if expr="enable_mdns">
     <div id="cloudprint-options-mdns" hidden>
       <div class="settings-row">
         <span i18n-content="cloudPrintOptionLabel"></span>
         <a target="_blank" i18n-content="learnMore"
            i18n-values="href:cloudPrintLearnMoreURL"></a>
       </div>
       <button id="cloudPrintDevicesPageButton"
               i18n-content="cloudPrintDevicesPageButton">
       </button>
 
@@ skipping 10 matching lines @@
             </label>
             <span class="controlled-setting-indicator"
                   pref="local_discovery.notifications_enabled">
             </span>
           </span>
       </div>
     </div>
 </if>
 
     <div id="cloudprint-options-nomdns">
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
       <div>
         <span i18n-content="cloudPrintOptionLabel"></span>
         <a target="_blank" i18n-content="learnMore"
            i18n-values="href:cloudPrintLearnMoreURL"></a>
       </div>
 </if>
 
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
       <p id="cloudPrintConnectorLabel" class="settings-row"
          i18n-content="cloudPrintConnectorDisabledLabel"></p>
 </if>
 
       <div class="settings-row">
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
         <button id="cloudPrintConnectorSetupButton"
                 i18n-content="cloudPrintConnectorDisabledButton"></button>
 </if>
 
         <button id="cloudPrintManageButton"
                 i18n-content="cloudPrintManageButton">
         </button>
       </div>
     </div>
   </section>
 
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <include src="startup_section.html">
   <section>
     <h3 i18n-content="accessibilityTitle"></h3>
     <div class="option-control-table">
       <p id="accessibility-explanation" class="settings-row">
         <span i18n-content="accessibilityExplanation"></span>
         <a target="_blank" i18n-content="learnMore"
             i18n-values="href:accessibilityLearnMoreURL"></a>
       </p>
       <div class="option-name">
@@ skipping 154 matching lines @@
                   i18n-content="accessibilityVirtualKeyboard">
               </label>
               <span class="controlled-setting-indicator"
                   pref="settings.a11y.virtual_keyboard">
               </span>
             </span>
           </span>
         </div>
       </div>
   </section>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">
   <section id="factory-reset-section" hidden>
     <h3 i18n-content="factoryResetTitle"></h3>
     <div>
       <span class="settings-row" i18n-content="factoryResetDescription">
       </span>
       <button id="factory-reset-restart"
           i18n-content="factoryResetRestart">
       </button>
     </div>
   </section>
 </if>
 </if>
-<if expr="not pp_ifdef('chromeos')">
+<if expr="not chromeos">
   <section id="system-section">
     <h3 i18n-content="advancedSectionTitleSystem"></h3>
 <if expr="not is_macosx">
     <div class="checkbox">
       <span class="controlled-setting-with-label">
         <input id="backgroundModeCheckbox" pref="background_mode.enabled"
             type="checkbox">
         <span>
           <label for="backgroundModeCheckbox"
               i18n-content="backgroundModeCheckbox">
@@ skipping 31 matching lines @@
     </div>
   </section>
   </div>  <!-- advanced-settings-container -->
   </div>  <!-- advanced-settings -->
   <footer>
     <button id="advanced-settings-expander" class="link-button"
         i18n-content="showAdvancedSettings">
     </button>
   </footer>
   </div>