From c20c4d903f17db15d5c4de452556eb0e34f30208 Mon Sep 17 00:00:00 2001
From: stevenjb <stevenjb@chromium.org>
Date: Mon, 21 Sep 2015 20:34:58 -0700
Subject: [PATCH] Elim cr-checkbox

cr-checkbox doesn't have any behaviors that we are concerned about or
specific styling so it can be simply removed for the reasons mentioned
in the issue.

BUG=532540

Review URL: https://codereview.chromium.org/1344303004

Cr-Commit-Position: refs/heads/master@{#350102}
---
 .../resources/settings/checkbox/checkbox.html      |  6 +--
 .../resources/settings/checkbox/checkbox.js        |  4 ++
 .../internet_page/internet_detail_page.css         |  2 +-
 .../internet_page/internet_detail_page.html        |  6 +--
 .../settings/internet_page/network_ip_config.css   |  2 +-
 .../settings/internet_page/network_ip_config.html  |  6 +--
 .../settings/internet_page/network_proxy.css       |  2 +-
 .../settings/internet_page/network_proxy.html      |  6 +--
 .../settings/internet_page/network_siminfo.html    |  6 +--
 .../resources/settings/sync_page/sync_page.css     |  4 +-
 .../resources/settings/sync_page/sync_page.html    | 38 ++++++++--------
 chrome/chrome_tests.gypi                           |  1 -
 .../webui/cr_elements/cr_elements_browsertest.js   | 37 ----------------
 .../checkbox_tests.js}                             | 48 ++++++++++----------
 .../data/webui/settings/cr_settings_browsertest.js |  2 +
 .../cr_elements/v1_0/compiled_resources.gyp        |  1 -
 .../v1_0/cr_checkbox/compiled_resources.gyp        | 11 -----
 .../cr_elements/v1_0/cr_checkbox/cr_checkbox.css   |  7 ---
 .../cr_elements/v1_0/cr_checkbox/cr_checkbox.html  | 14 ------
 .../cr_elements/v1_0/cr_checkbox/cr_checkbox.js    | 51 ----------------------
 .../cr_elements/v1_0/cr_checkbox/demo.html         | 13 ------
 .../resources/cr_elements/v1_0/demo_element.html   | 23 +++-------
 ui/webui/resources/cr_elements_resources.grdp      |  9 ----
 23 files changed, 73 insertions(+), 226 deletions(-)
 delete mode 100644 chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
 rename chrome/test/data/webui/{cr_elements/cr_checkbox_tests.js => settings/checkbox_tests.js} (60%)
 delete mode 100644 ui/webui/resources/cr_elements/v1_0/cr_checkbox/compiled_resources.gyp
 delete mode 100644 ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.css
 delete mode 100644 ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html
 delete mode 100644 ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.js
 delete mode 100644 ui/webui/resources/cr_elements/v1_0/cr_checkbox/demo.html

diff --git a/chrome/browser/resources/settings/checkbox/checkbox.html b/chrome/browser/resources/settings/checkbox/checkbox.html
index 15ef82ba4d3e..f1b3dac9476d 100644
--- a/chrome/browser/resources/settings/checkbox/checkbox.html
+++ b/chrome/browser/resources/settings/checkbox/checkbox.html
@@ -1,5 +1,5 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_indicator.html">
 <link rel="import" href="chrome://md-settings/pref_tracker/pref_tracker.html">
@@ -11,11 +11,11 @@
     <cr-settings-pref-tracker pref="[[pref]]"></cr-settings-pref-tracker>
 
     <div id="outerDiv" class="layout horizontal center">
-      <cr-checkbox id="checkbox" checked="{{checked}}"
+      <paper-checkbox id="checkbox" checked="{{checked}}"
           disabled="[[checkboxDisabled_(disabled, pref)]]">
         <span id="mainLabel">{{label}}</span>
         <span id="subLabel">{{subLabel}}</span>
-      </cr-checkbox>
+      </paper-checkbox>
       <cr-policy-indicator pref="[[pref]]"></cr-policy-indicator>
     </div>
   </template>
diff --git a/chrome/browser/resources/settings/checkbox/checkbox.js b/chrome/browser/resources/settings/checkbox/checkbox.js
index 49ebb3ab3fa8..834e856aab2f 100644
--- a/chrome/browser/resources/settings/checkbox/checkbox.js
+++ b/chrome/browser/resources/settings/checkbox/checkbox.js
@@ -36,13 +36,17 @@ Polymer({
     checked: {
       type: Boolean,
       value: false,
+      notify: true,
       observer: 'checkedChanged_',
+      reflectToAttribute: true
     },
 
     /** Disabled property for the element. */
     disabled: {
       type: Boolean,
       value: false,
+      notify: true,
+      reflectToAttribute: true
     },
 
     /** Checkbox label. */
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.css b/chrome/browser/resources/settings/internet_page/internet_detail_page.css
index a82a627a04dc..15a24f53472c 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.css
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.css
@@ -57,7 +57,7 @@
   max-width: 500px;
 }
 
-cr-checkbox {
+paper-checkbox {
   margin-bottom: 10px;
 }
 
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
index 29959fdecf9e..32e47c848381 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -1,8 +1,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.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-icons/iron-icons.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-icon-button/paper-icon-button.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_collapse.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_icon.html">
@@ -56,10 +56,10 @@
             </paper-icon-button>
             <span>Prefer this network</span>
           </div>
-          <cr-checkbox checked="{{autoConnect}}"
+          <paper-checkbox checked="{{autoConnect}}"
               hidden$="[[!showAutoConnect_(networkState)]]">
             Automatically connect to this network
-          </cr-checkbox>
+          </paper-checkbox>
 
           <!-- Properties to always show if present. -->
           <network-property-list
diff --git a/chrome/browser/resources/settings/internet_page/network_ip_config.css b/chrome/browser/resources/settings/internet_page/network_ip_config.css
index ef0dd9b8eb5b..98afcb9f5814 100644
--- a/chrome/browser/resources/settings/internet_page/network_ip_config.css
+++ b/chrome/browser/resources/settings/internet_page/network_ip_config.css
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
-cr-checkbox {
+paper-checkbox {
   margin-bottom: 10px;
 }
 
diff --git a/chrome/browser/resources/settings/internet_page/network_ip_config.html b/chrome/browser/resources/settings/internet_page/network_ip_config.html
index f6f2f9bdaddb..9d4a2399646e 100644
--- a/chrome/browser/resources/settings/internet_page/network_ip_config.html
+++ b/chrome/browser/resources/settings/internet_page/network_ip_config.html
@@ -1,5 +1,5 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_types.html">
 <link rel="import" href="network_property_list.html">
 
@@ -7,9 +7,9 @@
   <link rel="import" type="css" href="network_ip_config.css">
   <template>
     <div id="outer" class="layout vertical">
-      <cr-checkbox checked="{{automatic}}" disabled="[[!editable]]">
+      <paper-checkbox checked="{{automatic}}" disabled="[[!editable]]">
           Configure IP Address Automatically
-      </cr-checkbox>
+      </paper-checkbox>
       <network-property-list
           fields="[[ipConfigFields_]]" network-state="[[ipConfig]]"
           edit-field-types="[[getIPEditFields_(ipConfig, editable, automatic)]]"
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.css b/chrome/browser/resources/settings/internet_page/network_proxy.css
index 0c3f801bc54d..0606901d3361 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.css
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.css
@@ -19,7 +19,7 @@ span {
   margin: 5px;
 }
 
-cr-checkbox {
+paper-checkbox {
   margin-bottom: 10px;
 }
 
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html
index 095ed686fa36..0c5167602d48 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -1,6 +1,6 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.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/paper-styles.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_types.html">
 <link rel="import" href="network_property_list.html">
@@ -35,9 +35,9 @@
 
       <div hidden$="[[!matches_(proxy.Type, ProxySettingsType.MANUAL)]]"
           class="layout vertical">
-        <cr-checkbox id="useUrl" checked="{{useSameProxy}}">
+        <paper-checkbox id="useUrl" checked="{{useSameProxy}}">
             Use the same proxy for all protocols
-        </cr-checkbox>
+        </paper-checkbox>
         <div hidden$="[[!useSameProxy]]" class="layout vertical">
           <network-proxy-input editable="[[editable]]"
               value="{{proxy.Manual.HTTPProxy}}"
diff --git a/chrome/browser/resources/settings/internet_page/network_siminfo.html b/chrome/browser/resources/settings/internet_page/network_siminfo.html
index d0c497e928cd..1826478c5329 100644
--- a/chrome/browser/resources/settings/internet_page/network_siminfo.html
+++ b/chrome/browser/resources/settings/internet_page/network_siminfo.html
@@ -1,8 +1,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.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-dialog/paper-dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_types.html">
 <link rel="import" href="network_property_list.html">
@@ -29,11 +29,11 @@
         <div class="layout vertical"
             hidden$="[[isSimLocked_(networkState)]]">
           <!-- SIM unlocked -->
-          <cr-checkbox
+          <paper-checkbox
               checked="[[networkState.Cellular.SIMLockStatus.LockEnabled]]"
               on-change="onSimLockEnabledChange_">
             Enable SIM card locking (require PIN to use mobile data)
-          </cr-checkbox>
+          </paper-checkbox>
           <div class="layout horizontal center"
                hidden$="[[!networkState.Cellular.SIMLockStatus.LockEnabled]]">
             <!-- SIM lock enabled -->
diff --git a/chrome/browser/resources/settings/sync_page/sync_page.css b/chrome/browser/resources/settings/sync_page/sync_page.css
index 3cf92e790e5f..1e47219ea482 100644
--- a/chrome/browser/resources/settings/sync_page/sync_page.css
+++ b/chrome/browser/resources/settings/sync_page/sync_page.css
@@ -15,8 +15,8 @@ paper-radio-button {
   display: flex;
 }
 
-.checkbox-container-row > cr-checkbox {
+.checkbox-container-row > paper-checkbox {
   display: flex;
   flex-basis: 0;
   flex-grow: 1;
-}
\ No newline at end of file
+}
diff --git a/chrome/browser/resources/settings/sync_page/sync_page.html b/chrome/browser/resources/settings/sync_page/sync_page.html
index e8f89ba434de..e61c19b5df9f 100644
--- a/chrome/browser/resources/settings/sync_page/sync_page.html
+++ b/chrome/browser/resources/settings/sync_page/sync_page.html
@@ -1,8 +1,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.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-radio-button/paper-radio-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper-radio-group.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">
 
 <dom-module id="cr-settings-sync-page">
@@ -21,37 +21,37 @@
     </select>
     <div class="checkbox-container">
       <div class="checkbox-container-row">
-        <cr-checkbox>
+        <paper-checkbox>
           <span i18n-content="appCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="extensionsCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="settingsCheckboxLabel"></span>
-        </cr-checkbox>
+        </paper-checkbox>
       </div>
       <div class="checkbox-container-row">
-        <cr-checkbox>
+        <paper-checkbox>
           <span i18n-content="autofillCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="historyCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="themesAndWallpapersCheckboxLabel"></span>
-        </cr-checkbox>
+        </paper-checkbox>
       </div>
       <div class="checkbox-container-row">
-        <cr-checkbox>
+        <paper-checkbox>
           <span i18n-content="bookmarksCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="passwordsCheckboxLabel"></span>
-        </cr-checkbox>
-        <cr-checkbox>
+        </paper-checkbox>
+        <paper-checkbox>
           <span i18n-content="openTabsCheckboxLabel"></span>
-        </cr-checkbox>
+        </paper-checkbox>
       </div>
     </div>
     <div i18n-content="encryptionOptionsTitle"></div>
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f3f37578a4a9..ba8680b95969 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -947,7 +947,6 @@
       'test/data/webui/async_gen.js',
       'test/data/webui/certificate_viewer_dialog_test.js',
       'test/data/webui/chrome_send_browsertest.js',
-      'test/data/webui/cr_elements/cr_elements_browsertest.js',
       'test/data/webui/history_browsertest.js',
       'test/data/webui/mock4js_browsertest.js',
       'test/data/webui/net_internals/bandwidth_view.js',
diff --git a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
deleted file mode 100644
index 2e3b69fd073e..000000000000
--- a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/** @fileoverview Runs the Chromium Polymer elements tests. */
-
-/** @const {string} Path to source root. */
-var ROOT_PATH = '../../../../../';
-
-// Polymer BrowserTest fixture.
-GEN_INCLUDE(
-    [ROOT_PATH + 'chrome/test/data/webui/polymer_browser_test_base.js']);
-
-/**
- * Test fixture for Chromium Polymer elements.
- * @constructor
- * @extends {PolymerTest}
-*/
-function CrElementsBrowserTest() {}
-
-CrElementsBrowserTest.prototype = {
-  __proto__: PolymerTest.prototype,
-
-  // List tests for individual elements.
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
-    'cr_checkbox_tests.js',
-  ]),
-};
-
-// Runs all tests.
-TEST_F('CrElementsBrowserTest', 'CrElementsTest', function() {
-  // Register mocha tests for each element.
-  cr_checkbox.registerTests();
-
-  // Run all registered tests.
-  mocha.run();
-});
diff --git a/chrome/test/data/webui/cr_elements/cr_checkbox_tests.js b/chrome/test/data/webui/settings/checkbox_tests.js
similarity index 60%
rename from chrome/test/data/webui/cr_elements/cr_checkbox_tests.js
rename to chrome/test/data/webui/settings/checkbox_tests.js
index b7c20d271c16..6d4bcb528695 100644
--- a/chrome/test/data/webui/cr_elements/cr_checkbox_tests.js
+++ b/chrome/test/data/webui/settings/checkbox_tests.js
@@ -2,43 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/** @fileoverview Suite of tests for cr-checkbox. */
-cr.define('cr_checkbox', function() {
+/** @fileoverview Suite of tests for cr-settings-checkbox. */
+cr.define('cr_settings_checkbox', function() {
   function registerTests() {
-    suite('CrCheckbox', function() {
+    suite('CrSettingsCheckbox', function() {
       /**
        * Checkbox created before each test.
-       * @type {CrCheckbox}
+       * @type {CrSettingsCheckbox}
        */
       var checkbox;
 
-      // Import cr_checkbox.html before running suite.
+      /**
+       * Pref value used in tests, should reflect checkbox 'checked' attribute.
+       * @type {CrSettingsCheckbox}
+       */
+      var pref = {
+        key: 'test',
+        type: chrome.settingsPrivate.PrefType.BOOLEAN,
+        value: true
+      };
+
+      // Import cr_settings_checkbox.html before running suite.
       suiteSetup(function() {
         return PolymerTest.importHtml(
-            'chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html');
+            'chrome://md-settings/checkbox/checkbox.html');
       });
 
-      // Initialize a checked cr-checkbox before each test.
-      setup(function(done) {
+      // Initialize a checked cr-settings-checkbox before each test.
+      setup(function() {
         PolymerTest.clearBody();
-        checkbox = document.createElement('cr-checkbox');
-        checkbox.setAttribute('checked', '');
+        checkbox = document.createElement('cr-settings-checkbox');
+        checkbox.set('pref', pref);
         document.body.appendChild(checkbox);
-
-        // Allow for the checkbox to be created and attached.
-        setTimeout(done);
-      });
-
-      test('can toggle', function() {
-        assertTrue(checkbox.checked);
-
-        checkbox.toggle();
-        assertFalse(checkbox.checked);
-        assertFalse(checkbox.hasAttribute('checked'));
-
-        checkbox.toggle();
-        assertTrue(checkbox.checked);
-        assertTrue(checkbox.hasAttribute('checked'));
       });
 
       test('responds to checked attribute', function() {
@@ -46,9 +41,11 @@ cr.define('cr_checkbox', function() {
 
         checkbox.removeAttribute('checked');
         assertFalse(checkbox.checked);
+        assertFalse(pref.value);
 
         checkbox.setAttribute('checked', '');
         assertTrue(checkbox.checked);
+        assertTrue(pref.value);
       });
 
       test('fires a change event', function(done) {
@@ -63,6 +60,7 @@ cr.define('cr_checkbox', function() {
         checkbox.checked = false;
         checkbox.setAttribute('disabled', '');
         assertTrue(checkbox.disabled);
+        assertTrue(checkbox.$.checkbox.disabled);
 
         MockInteractions.tap(checkbox.$.checkbox);
         assertFalse(checkbox.checked);
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index 89e24608dd55..cc0bc84313ad 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -28,6 +28,7 @@ CrSettingsBrowserTest.prototype = {
 
   /** @override */
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+    'checkbox_tests.js',
     'prefs_test_cases.js',
     'prefs_tests.js',
   ]),
@@ -36,6 +37,7 @@ CrSettingsBrowserTest.prototype = {
 // Runs all tests.
 TEST_F('CrSettingsBrowserTest', 'CrSettingsTest', function() {
   // Register mocha tests for each element.
+  cr_settings_checkbox.registerTests();
   cr_settings_prefs.registerTests();
 
   // Run all registered tests.
diff --git a/ui/webui/resources/cr_elements/v1_0/compiled_resources.gyp b/ui/webui/resources/cr_elements/v1_0/compiled_resources.gyp
index 657fc393328b..7b24a067bda8 100644
--- a/ui/webui/resources/cr_elements/v1_0/compiled_resources.gyp
+++ b/ui/webui/resources/cr_elements/v1_0/compiled_resources.gyp
@@ -7,7 +7,6 @@
       'target_name': 'cr_elements_resources',
       'type': 'none',
       'dependencies': [
-        'cr_checkbox/compiled_resources.gyp:*',
         'network/compiled_resources.gyp:*',
         'policy/compiled_resources.gyp:*',
       ],
diff --git a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/compiled_resources.gyp b/ui/webui/resources/cr_elements/v1_0/cr_checkbox/compiled_resources.gyp
deleted file mode 100644
index 45f2f21eb7c4..000000000000
--- a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/compiled_resources.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
-  'targets': [
-    {
-      'target_name': 'cr_checkbox',
-      'includes': ['../../../../../../third_party/closure_compiler/compile_js.gypi'],
-    }
-  ],
-}
diff --git a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.css b/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.css
deleted file mode 100644
index 204e397c466b..000000000000
--- a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright 2015 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  display: inline-block;
-}
diff --git a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html b/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html
deleted file mode 100644
index 6fae2ad9fd46..000000000000
--- a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_events/cr_events.html">
-
-<dom-module id="cr-checkbox">
-  <link rel="import" type="css" href="cr_checkbox.css">
-  <template>
-    <cr-events id="events"></cr-events>
-    <paper-checkbox id="checkbox" checked="{{checked}}" disabled="[[disabled]]">
-      <content></content>
-    </paper-checkbox>
-  </template>
-  <script src="cr_checkbox.js"></script>
-</dom-module>
diff --git a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.js b/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.js
deleted file mode 100644
index c193ed0288b1..000000000000
--- a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * @fileoverview
- * `cr-checkbox` is a button that can be either checked or unchecked. User
- * can tap the checkbox to check or uncheck it. Usually you use checkboxes
- * to allow user to select multiple options from a set. If you have a single
- * ON/OFF option, avoid using a single checkbox and use `cr-toggle-button`
- * instead.
- *
- * Example:
- *     <cr-checkbox></cr-checkbox>
- *     <cr-checkbox checked></cr-checkbox>
- *
- * @element cr-checkbox
- */
-Polymer({
-  is: 'cr-checkbox',
-
-  properties: {
-    /**
-     * Gets or sets the state. `true` is checked and `false` is unchecked.
-     */
-    checked: {
-      type: Boolean,
-      value: false,
-      notify: true,
-      reflectToAttribute: true
-    },
-
-    /**
-     * If true, the user cannot interact with this element.
-     */
-    disabled: {
-      type: Boolean,
-      value: false,
-      reflectToAttribute: true
-    },
-  },
-
-  toggle: function() {
-    this.checked = !this.checked;
-  },
-
-  /** @override */
-  ready: function() {
-    this.$.events.forward(this.$.checkbox, ['change']);
-  },
-});
diff --git a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/demo.html b/ui/webui/resources/cr_elements/v1_0/cr_checkbox/demo.html
deleted file mode 100644
index 9e4bf2de8389..000000000000
--- a/ui/webui/resources/cr_elements/v1_0/cr_checkbox/demo.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-  <link href="cr_checkbox.html" rel="import">
-</head>
-<body unresolved>
-  <h2>Unchecked:</h2>
-  <cr-checkbox>Unchecked Box</cr-checkbox>
-  <h2>Checked:</h2>
-  <cr-checkbox checked>Checked Box</cr-checkbox>
-  <h2>Disabled:</h2>
-  <cr-checkbox disabled>Disabled Box</cr-checkbox>
-</body>
-</html>
diff --git a/ui/webui/resources/cr_elements/v1_0/demo_element.html b/ui/webui/resources/cr_elements/v1_0/demo_element.html
index e3876c990bd2..69db8825e7c5 100644
--- a/ui/webui/resources/cr_elements/v1_0/demo_element.html
+++ b/ui/webui/resources/cr_elements/v1_0/demo_element.html
@@ -1,7 +1,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.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/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_collapse/cr_collapse.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr_expand_button.html">
 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_input/cr_input.html">
@@ -25,19 +25,6 @@
       </div>
     </div>
 
-    <h3>cr-checkbox</h3>
-    <div class="layout vertical">
-      <div class="layout horizontal">
-        <cr-checkbox checked="{{checkboxChecked1}}">Checkbox1</cr-checkbox>
-        <cr-checkbox checked="{{checkboxChecked2}}">Checkbox2</cr-checkbox>
-      </div>
-      <cr-checkbox checked="{{checkboxChecked}}">Checkbox Linked</cr-checkbox>
-      <cr-checkbox checked="{{checkboxChecked}}">
-        <span>[[checkboxLabel]]</span>&nbsp;
-        <span>[[subLabel]]</span>
-      </cr-checkbox>
-    </div>
-
     <h3>cr-input</h3>
     <div class="layout vertical">
       <div class="layout horizontal">
@@ -60,9 +47,9 @@
       <cr-toggle-button checked="{{toggleButtonChecked}}">
         Toggle Button
       </cr-toggle-button>
-      <cr-checkbox checked="{{toggleButtonChecked}}">
+      <paper-checkbox checked="{{toggleButtonChecked}}">
         Bound Checkbox
-      </cr-checkbox>
+      </paper-checkbox>
       <div class="layout horizontal">
         <cr-toggle-button checked="{{toggleButtonChecked2}}">
           Toggle Button 2
@@ -81,8 +68,8 @@
       <cr-collapse opened="[[collapseOpened]]">
         <div class="layout vertical">
           <span>Collapsable Section 1</span>
-          <cr-checkbox>Advanced option 1</cr-checkbox>
-          <cr-checkbox>Advanced option 2</cr-checkbox>
+          <paper-checkbox>Advanced option 1</paper-checkbox>
+          <paper-checkbox>Advanced option 2</paper-checkbox>
         </div>
       </cr-collapse>
       <cr-button toggles active="{{collapseOpened2}}">
diff --git a/ui/webui/resources/cr_elements_resources.grdp b/ui/webui/resources/cr_elements_resources.grdp
index a8315f4da631..1a4c0b86a47e 100644
--- a/ui/webui/resources/cr_elements_resources.grdp
+++ b/ui/webui/resources/cr_elements_resources.grdp
@@ -27,15 +27,6 @@
   <structure name="IDR_CR_ELEMENTS_1_0_CR_BUTTON_JS"
              file="../../webui/resources/cr_elements/v1_0/cr_button/cr_button.js"
              type="chrome_html" />
-  <structure name="IDR_CR_ELEMENTS_1_0_CR_CHECKBOX_CSS"
-             file="../../webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.css"
-             type="chrome_html" />
-  <structure name="IDR_CR_ELEMENTS_1_0_CR_CHECKBOX_HTML"
-             file="../../webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.html"
-             type="chrome_html" />
-  <structure name="IDR_CR_ELEMENTS_1_0_CR_CHECKBOX_JS"
-             file="../../webui/resources/cr_elements/v1_0/cr_checkbox/cr_checkbox.js"
-             type="chrome_html" />
   <structure name="IDR_CR_ELEMENTS_1_0_CR_COLLAPSE_CSS"
              file="../../webui/resources/cr_elements/v1_0/cr_collapse/cr_collapse.css"
              type="chrome_html" />
-- 
2.11.4.GIT