Enable the option item that uses the Spelling service on Chrome OS

This change enables a check item "Use a web service to help resolve spelling errors" added by r122728 <http://crrev.com/122728> also on Chrome OS. It also moves the position of this item above the "Automatically send usage statistics..." item as suggested in a privacy review.

BUG=103840
TEST=manual 

Review URL: http://codereview.chromium.org/9564004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124642 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/options/advanced_options.html

@@ -49,6 +49,16 @@
             <span i18n-content="safeBrowsingEnableProtection"></span>
           </label>
         </div>
+<if expr="pp_ifdef('_google_chrome')">
+        <div class="checkbox">
+          <label>
+            <input id="spellingServiceEnabled"
+                pref="spellcheck.use_spelling_service"
+                metric="Options_UseSpellingServiceCheckbox" type="checkbox">
+            <span i18n-content="spellingPref"></span>
+          </label>
+        </div>
+</if>
 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
         <div id="metricsReportingSetting" class="checkbox">
           <label>
@@ -67,16 +77,6 @@
             <span i18n-content="enableLogging"></span>
           </label>
         </div>
-</if>
-<if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
-        <div class="checkbox">
-          <label>
-            <input id="spellingServiceEnabled"
-                pref="spellcheck.use_spelling_service"
-                metric="Options_UseSpellingServiceCheckbox" type="checkbox">
-            <span i18n-content="spellingPref"></span>
-          </label>
-        </div>
 </if>
       </div>
     </section>

chrome/browser/resources/options2/browser_options.html

@@ -336,6 +336,16 @@
           <span i18n-content="safeBrowsingEnableProtection"></span>
         </label>
       </div>
+<if expr="pp_ifdef('_google_chrome')">
+      <div class="checkbox">
+        <label>
+          <input id="spellingServiceEnabled"
+              pref="spellcheck.use_spelling_service"
+              metric="Options_UseSpellingServiceCheckbox" type="checkbox">
+          <span i18n-content="spellingPref"></span>
+        </label>
+      </div>
+</if>
 <if expr="pp_ifdef('_google_chrome') and pp_ifdef('chromeos')">
       <div id="metricsReportingSetting" class="checkbox">
         <label>
@@ -354,16 +364,6 @@
           <span i18n-content="enableLogging"></span>
         </label>
       </div>
-</if>
-<if expr="pp_ifdef('_google_chrome') and not pp_ifdef('chromeos')">
-      <div class="checkbox">
-        <label>
-          <input id="spellingServiceEnabled"
-              pref="spellcheck.use_spelling_service"
-              metric="Options_UseSpellingServiceCheckbox" type="checkbox">
-          <span i18n-content="spellingPref"></span>
-        </label>
-      </div>
 </if>
     </div>
   </section>