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

chrome/browser/resources/options/content_settings.html

 <div id="content-settings-page" class="page" hidden>
   <div class="close-button"></div>
   <h1 i18n-content="contentSettingsPage"></h1>
   <div class="content-area">
     <!-- Cookie filter tab contents -->
     <section>
       <h3 i18n-content="cookies_tab_label"></h3>
       <div>
         <div class="radio">
           <span class="controlled-setting-with-label">
@@ skipping 267 matching lines @@
             <input id="location-block" type="radio" name="location"
                 value="block">
             <span>
               <label for="location-block" i18n-content="location_block"></label>
               <span class="controlled-setting-indicator"
                   content-setting="location" value="block">
               </span>
             </span>
           </span>
         </div>
-<if expr="pp_ifdef('enable_google_now')">
+<if expr="enable_google_now">
         <div class="checkbox" id="geolocationCheckbox" hidden>
           <span class="controlled-setting-with-label">
             <input id="googleGeolocationAccessEnabled"
                 pref="googlegeolocationaccess.enabled"
                 metric="Options_GoogleGeolocationAccessCheckbox"
                 type="checkbox">
             <span>
               <label for="googleGeolocationAccessEnabled"
                   i18n-content="googleGeolocationAccessEnable">
               </label>
@@ skipping 90 matching lines @@
             <input type="radio" name="mouselock" value="block">
             <span i18n-content="mouselock_block"></span>
           </label>
         </div>
         <div class="settings-row">
           <button class="exceptions-list-button" contentType="mouselock"
               i18n-content="manageExceptions"></button>
         </div>
       </div>
     </section>
-<if expr="pp_ifdef('chromeos') or is_win">
+<if expr="chromeos or is_win">
     <!-- Protected Content filter -->
     <section guest-visibility="disabled">
       <h3 i18n-content="protectedContentTabLabel"
           class="content-settings-header"></h3>
       <div>
         <div class="settings-row">
           <p i18n-content="protectedContentInfo"></p>
         </div>
         <div class="checkbox">
           <label>
             <input pref="settings.privacy.drm_enabled" type="checkbox">
             <span i18n-content="protectedContentEnable"></span>
           </label>
         </div>
-<if expr="pp_ifdef('chromeos')">
+<if expr="chromeos">

[Nico, 2014/02/19 01:08:43]

Should this be indented to make it more obvious this is nested?

[newt (away), 2014/02/19 01:43:15]

Maybe, though it could be confusing to have two interleaved but independent
levels of nesting. I've made the change. WDYT?

[Nico, 2014/02/19 01:44:50]

Maybe marginally better? Up to you.

         <div class="settings-row">
           <button id="protected-content-exceptions"
               class="exceptions-list-button" contentType="protectedContent"
               i18n-content="manageExceptions"></button>
         </div>
 </if>
       </div>
     </section>
 </if>
     <!-- Media Stream capture device filter -->
@@ skipping 169 matching lines @@
     </section>
   </div>
   <div class="action-area">
     <div class="button-strip">
       <button id="content-settings-overlay-confirm" class="default-button"
           i18n-content="done">
       </button>
     </div>
   </div>
 </div>