Enable the new CBD dialog on desktop

This enables the new Clear Browsing Data dialog by default for desktop.
privacy_page_test.js needs a small fix, so it doesn't break. 
I will change privacy_page_test.js to completely run on the new ui
in https://crrev.com/c/647713.

Bug: 725401
Change-Id: I8647e53bc93725c84cf45ada46123d84038c9a78
Reviewed-on: https://chromium-review.googlesource.com/647712Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504351}

chrome/common/chrome_features.cc

@@ -111,14 +111,7 @@ const base::Feature kTabStripKeyboardFocus{"TabStripKeyboardFocus",
 #endif  // defined(OS_MACOSX)
 
 // Enables Basic/Advanced tabs in ClearBrowsingData.
-const base::Feature kTabsInCbd {
-  "TabsInCBD",
-#if defined(OS_ANDROID)
-      base::FEATURE_ENABLED_BY_DEFAULT
-#else
-      base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-};
+const base::Feature kTabsInCbd{"TabsInCBD", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // If enabled, we'll only take thumbnails of unknown URLs (i.e. URLs that are
 // not (yet) part of TopSites) if they have an interesting transition type, i.e.

chrome/test/data/webui/settings/privacy_page_test.js

@@ -117,11 +117,11 @@ cr.define('settings_privacy_page', function() {
       teardown(function() { page.remove(); });
 
       test('showClearBrowsingDataDialog', function() {
-        assertFalse(!!page.$$('settings-clear-browsing-data-dialog'));
+        assertFalse(!!page.$$('settings-clear-browsing-data-dialog-tabs'));
         MockInteractions.tap(page.$$('#clearBrowsingData'));
         Polymer.dom.flush();
 
-        var dialog = page.$$('settings-clear-browsing-data-dialog');
+        var dialog = page.$$('settings-clear-browsing-data-dialog-tabs');
         assertTrue(!!dialog);
 
         // Ensure that the dialog is fully opened before returning from this