Revert of [i18n] chromeos login i18n-content to $i18n{}

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

 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 
 <iron-iconset-svg name="oobe-hid-detection" size="24">
   <svg>
     <defs>
       <g id="bluetooth"><path d="M17.71 7.71L12 2h-1v7.59L6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 11 14.41V22h1l5.71-5.71-4.3-4.29 4.3-4.29zM13 5.83l1.88 1.88L13 9.59V5.83zm1.88 10.46L13 18.17v-3.76l1.88 1.88z"></path></g>
     </defs>
   </svg>
 </iron-iconset-svg>
 
 <dom-module name="oobe-hid-detection-md">
   <template>
     <link rel="stylesheet" href="oobe_hid_detection.css">
     <link rel="stylesheet" href="oobe_dialog_parameters.css">
     <link rel="stylesheet" href="../../options/chromeos/bluetooth.css">
     <oobe-dialog has-buttons>
       <iron-icon icon="oobe-hid-detection:bluetooth" class="oobe-icon">
       </iron-icon>
       <div class="header">
-        <h1 class="title">$i18n{hidDetectionInvitation}</h1>
-        <div class="subtitle">$i18n{hidDetectionPrerequisites}</div>
+        <h1 class="title" i18n-content="hidDetectionInvitation"></h1>
+        <div class="subtitle" i18n-content="hidDetectionPrerequisites"></div>
       </div>
       <div class="footer flex layout vertical">
         <div class="layout vertical justified hid-selection-entry">
           <div class="layout horizontal center">
             <img id="mouse-icon" alt=""
                 src="chrome://theme/IDR_BLUETOOTH_MOUSE">
             <img id="mouse-tick" alt=""
                 hidden="[[!tickIsVisible_(mouseState_)]]"
                 src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
             <div id="mouse-label-searching" aria-live="polite"
+                i18n-content="hidDetectionMouseSearching"
                 hidden="[[notEq_(mouseState_, screen.CONNECTION.SEARCHING)]]">
-              $i18n{hidDetectionMouseSearching}
             </div>
             <div id="mouse-label-usb" aria-live="polite"
+                i18n-content="hidDetectionUSBMouseConnected"
                 hidden="[[notEq_(mouseState_, screen.CONNECTION.USB)]]">
-              $i18n{hidDetectionUSBMouseConnected}
             </div>
             <div id="mouse-label-connected" aria-live="polite"
+                i18n-content="hidDetectionPointingDeviceConnected"
                 hidden="[[notEq_(mouseState_, screen.CONNECTION.CONNECTED)]]">
-              $i18n{hidDetectionPointingDeviceConnected}
             </div>
             <div id="mouse-label-paired" aria-live="polite"
+                i18n-content="hidDetectionBTMousePaired"
                 hidden="[[notEq_(mouseState_, screen.CONNECTION.PAIRED)]]">
-              $i18n{hidDetectionBTMousePaired}
             </div>
           </div>
         </div>
         <div class="layout vertical hid-selection-entry">
           <div class="layout horizontal center">
             <img id="keyboard-icon" alt=""
                 src="chrome://theme/IDR_BLUETOOTH_KEYBOARD">
             <img id="keyboard-tick" alt=""
                 hidden="[[!tickIsVisible_(keyboardState_)]]"
                 src="chrome://theme/IDR_BLUETOOTH_PAIRING_TICK">
             <div aria-live="polite"
+                i18n-content="hidDetectionKeyboardSearching"
                 hidden="[[notEq_(keyboardState_, screen.CONNECTION.SEARCHING)]]"
                 >
-               $i18n{hidDetectionKeyboardSearching}
             </div>
             <div aria-live="polite"
+                i18n-content="hidDetectionUSBKeyboardConnected"
                 hidden="[[notEq_(keyboardState_, screen.CONNECTION.USB)]]">
-              $i18n{hidDetectionUSBKeyboardConnected}
             </div>
             <div aria-live="polite"
                 hidden="[[notEq_(keyboardState_, screen.CONNECTION.PAIRED)]]">
                [[keyboardPairedLabel]]
             </div>
             <div hidden="[[notEq_(keyboardState_, screen.CONNECTION.PAIRING)]]">
                [[keyboardPairingLabel]]
             </div>
           </div>
           <div id="hid-keyboard-pincode"
@@ skipping 11 matching lines @@
             <div id="hid-keyboard-pincode-sym-4"
                 class="bluetooth-keyboard-button">
             </div>
             <div id="hid-keyboard-pincode-sym-5"
                 class="bluetooth-keyboard-button">
             </div>
             <div id="hid-keyboard-pincode-sym-6"
                 class="bluetooth-keyboard-button">
             </div>
             <div id="hid-keyboard-pincode-sym-7"
+                i18n-content="hidDetectionBTEnterKey"
                 class="bluetooth-keyboard-button">
-              $i18n{hidDetectionBTEnterKey}
             </div>
           </div>
         </div>
       </div>
       <div class="bottom-buttons flex layout horizontal end-justified">
         <oobe-text-button id="hid-continue-button"
             inverse on-tap="onHIDContinueTap_"
             disabled="[[continueButtonDisabled]]">
-          <div id="continue-button-text">$i18n{hidDetectionContinue}</div>
+          <div i18n-content="hidDetectionContinue" id="continue-button-text">
+          </div>
         </oobe-text-button>
       </div>
     </oobe-dialog>
   </template>
 </dom-module>