Remove isDriveMounted from destination select

|driveDestinationKey| now triggers whether to show the Save to Drive
destination in the dropdown on Chrome OS.

Bug: 1112416
Change-Id: I2cb61425796fe80dac4e862f048da5addea3c46a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441954
Commit-Queue: Gavin Williams <gavinwill@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814935}

chrome/browser/resources/print_preview/ui/app.js

@@ -341,11 +341,6 @@ Polymer({
           settings.serializedDefaultDestinationSelectionRulesStr,
           settings.userAccounts || null, settings.syncAvailable,
           settings.pdfPrinterDisabled, settings.isDriveMounted || false);
-      // <if expr="chromeos">
-      if (this.saveToDriveFlagEnabled_) {
-        this.$.sidebar.setIsDriveMounted(settings.isDriveMounted);
-      }
-      // </if>
       this.destinationsManaged_ = settings.destinationsManaged;
       this.isInKioskAutoPrintMode_ = settings.isInKioskAutoPrintMode;
 

chrome/browser/resources/print_preview/ui/destination_select_cros.html

@@ -26,8 +26,8 @@
         <option value="[[pdfDestinationKey_]]" hidden$="[[pdfPrinterDisabled]]">
           $i18n{printToPDF}
         </option>
-        <option value="[[driveDestinationKeyCros_]]"
-            hidden$="[[!driveDestinationKeyCros_]]">
+        <option value="[[driveDestinationKey]]"
+            hidden$="[[!driveDestinationKey]]">
           $i18n{printToGoogleDrive}
         </option>
         <option value="noDestinations"
@@ -45,7 +45,7 @@
           value="[[destination]]" hidden$="[[!loaded]]"
           item-list="[[recentDestinationList]]"
           pdf-destination-key="[[pdfDestinationKey_]]"
-          drive-destination-key="[[driveDestinationKeyCros_]]"
+          drive-destination-key="[[driveDestinationKey]]"
           no-destinations="[[noDestinations]]"
           pdf-printer-disabled="[[pdfPrinterDisabled]]"
           destination-icon="[[destinationIcon_]]" disabled="[[disabled]]"

chrome/browser/resources/print_preview/ui/destination_select_cros.js

@@ -46,11 +46,6 @@ Polymer({
 
     driveDestinationKey: String,
 
-    isDriveMounted: {
-      type: Boolean,
-      value: true,
-    },
-
     loaded: Boolean,
 
     noDestinations: Boolean,
@@ -115,13 +110,6 @@ Polymer({
       },
       readOnly: true,
     },
-
-    /** @private */
-    driveDestinationKeyCros_: {
-      type: String,
-      computed: 'computeDriveDestinationKeyCros_(' +
-          'driveDestinationKey, saveToDriveFlagEnabled_, isDriveMounted)',
-    },
   },
 
   /** @private {!IronMetaElement} */
@@ -356,16 +344,4 @@ Polymer({
             .shadowRoot.querySelectorAll('.list-item:not([hidden])') :
         this.shadowRoot.querySelectorAll('option:not([hidden])');
   },
-
-  /**
-   * @return {string}
-   * @private
-   */
-  computeDriveDestinationKeyCros_: function() {
-    if (!this.saveToDriveFlagEnabled_) {
-      return this.driveDestinationKey;
-    }
-
-    return this.isDriveMounted ? SAVE_TO_DRIVE_CROS_DESTINATION_KEY : '';
-  },
 });

chrome/browser/resources/print_preview/ui/destination_settings.js

@@ -28,6 +28,9 @@ import {beforeNextRender, html, Polymer} from 'chrome://resources/polymer/v3_0/p
 
 import {CloudPrintInterfaceImpl} from '../cloud_print_interface_impl.js';
 import {createDestinationKey, createRecentDestinationKey, Destination, DestinationOrigin, makeRecentDestination, RecentDestination} from '../data/destination.js';
+// <if expr="chromeos">
+import {SAVE_TO_DRIVE_CROS_DESTINATION_KEY} from '../data/destination.js';
+// </if>
 import {getPrinterTypeForDestination, PrinterType} from '../data/destination_match.js';
 import {DestinationErrorType, DestinationStore} from '../data/destination_store.js';
 import {InvitationStore} from '../data/invitation_store.js';
@@ -173,6 +176,15 @@ Polymer({
       },
       readOnly: true,
     },
+
+    /** @private */
+    saveToDriveFlagEnabled_: {
+      type: Boolean,
+      value() {
+        return loadTimeData.getBoolean('printSaveToDrive');
+      },
+      readOnly: true,
+    },
     // </if>
   },
 
@@ -224,9 +236,14 @@ Polymer({
 
   /** @private */
   updateDriveDestination_() {
-    const key = createDestinationKey(
+    let key = createDestinationKey(
         Destination.GooglePromotedId.DOCS, DestinationOrigin.COOKIES,
         this.activeUser_);
+    // <if expr="chromeos">
+    if (this.saveToDriveFlagEnabled_) {
+      key = SAVE_TO_DRIVE_CROS_DESTINATION_KEY;
+    }
+    // </if>
     this.driveDestinationKey_ =
         this.destinationStore_.getDestinationByKey(key) ? key : '';
   },
@@ -640,10 +657,5 @@ Polymer({
     this.destination.eulaUrl = e.detail;
     this.notifyPath('destination.eulaUrl');
   },
-
-  /** @param {boolean} isDriveMounted */
-  setIsDriveMounted(isDriveMounted) {
-    this.$.destinationSelect.isDriveMounted = isDriveMounted;
-  },
   // </if>
 });

chrome/browser/resources/print_preview/ui/sidebar.js

@@ -237,11 +237,4 @@ Polymer({
     const linkContainer = this.$$('print-preview-link-container');
     return !!linkContainer && linkContainer.systemDialogLinkAvailable();
   },
-
-  // <if expr="chromeos">
-  /** @param {boolean} isDriveMounted */
-  setIsDriveMounted(isDriveMounted) {
-    this.$.destinationSettings.setIsDriveMounted(isDriveMounted);
-  },
-  // </if>
 });

chrome/test/data/webui/print_preview/destination_select_test_cros.js

@@ -354,7 +354,6 @@ destination_select_test_cros.TestNames = {
   ChangeIconDeprecationWarnings: 'change icon deprecation warnings',
   EulaIsDisplayed: 'eula is displayed',
   SelectDriveDestination: 'select drive destination',
-  IsDriveMounted: 'is drive mounted',
 };
 
 suite(destination_select_test_cros.suiteName, function() {
@@ -442,8 +441,6 @@ suite(destination_select_test_cros.suiteName, function() {
 
           return selectOption(
               destinationSelect,
-              loadTimeData.getBoolean('printSaveToDrive') ?
-                  SAVE_TO_DRIVE_CROS_DESTINATION_KEY :
                   driveKey);
         })
         .then(() => {
@@ -633,27 +630,4 @@ suite(destination_select_test_cros.suiteName, function() {
                   expectedKey, destinationSelect.$$('.md-select').value);
             });
       });
-
-  test(
-      assert(destination_select_test_cros.TestNames.IsDriveMounted),
-      function() {
-        return waitBeforeNextRender(destinationSelect)
-            .then(() => {
-              const options =
-                  Array.from(destinationSelect.getVisibleItemsForTest());
-              assertTrue(!!options.find(
-                  option =>
-                      option.value === SAVE_TO_DRIVE_CROS_DESTINATION_KEY));
-
-              destinationSelect.isDriveMounted = false;
-              return waitBeforeNextRender(destinationSelect);
-            })
-            .then(() => {
-              const options =
-                  Array.from(destinationSelect.getVisibleItemsForTest());
-              assertTrue(!options.find(
-                  option =>
-                      option.value === SAVE_TO_DRIVE_CROS_DESTINATION_KEY));
-            });
-      });
 });

chrome/test/data/webui/print_preview/destination_settings_test.js

@@ -35,7 +35,8 @@ destination_settings_test.TestNames = {
   ResetDestinationOnSignOut: 'reset destination on sign out',
   DisabledSaveAsPdf: 'disabled save as pdf',
   NoDestinations: 'no destinations',
-  EulaIsRetrieved: 'eula is retrieved'
+  EulaIsRetrieved: 'eula is retrieved',
+  DriveIsNotMounted: 'drive is not mounted',
 };
 
 suite(destination_settings_test.suiteName, function() {
@@ -66,6 +67,9 @@ suite(destination_settings_test.suiteName, function() {
   /** @type {boolean} */
   let pdfPrinterDisabled = false;
 
+  /** @type {boolean} */
+  let isDriveMounted = true;
+
   /** @type {string} */
   const defaultUser = 'foo@chromium.org';
 
@@ -125,7 +129,7 @@ suite(destination_settings_test.suiteName, function() {
         // still not loaded.
         destinationSettings.init(
             'FooDevice' /* printerName */, false /* pdfPrinterDisabled */,
-            true /* isDriveMounted */,
+            isDriveMounted,
             '' /* serializedDefaultDestinationSelectionRulesStr */,
             [] /* userAccounts */, true /* syncAvailable */);
         assertFalse(dropdown.loaded);
@@ -199,7 +203,7 @@ suite(destination_settings_test.suiteName, function() {
     destinationSettings.setSetting('recentDestinations', recentDestinations);
     destinationSettings.appKioskMode = false;
     destinationSettings.init(
-        '' /* printerName */, pdfPrinterDisabled, true /* isDriveMounted */,
+        '' /* printerName */, pdfPrinterDisabled, isDriveMounted,
         '' /* serializedDefaultDestinationSelectionRulesStr */, initialAccounts,
         true /* syncAvailable */);
     destinationSettings.state = State.READY;
@@ -938,7 +942,6 @@ suite(destination_settings_test.suiteName, function() {
     });
   });
 
-  if (isChromeOS) {
     /**
      * Tests that destinations with a EULA will fetch the EULA URL when
      * selected.
@@ -1005,5 +1008,21 @@ suite(destination_settings_test.suiteName, function() {
                     expectedUrl, destinationSettings.destination.eulaUrl);
               });
         });
-  }
+
+    // Tests that disabling Google Drive on Chrome OS hides the Save to Drive
+    // destination.
+    test(
+        assert(destination_settings_test.TestNames.DriveIsNotMounted),
+        function() {
+          isDriveMounted = false;
+          initialize();
+
+          return nativeLayer.whenCalled('getPrinterCapabilities')
+              .then(() => {
+                return waitBeforeNextRender(destinationSettings);
+              })
+              .then(() => {
+                assertDropdownItems(['Save as PDF/local/']);
+              });
+        });
 });

chrome/test/data/webui/print_preview/print_preview_ui_browsertest.js

@@ -1294,60 +1294,6 @@ TEST_F(
           destination_select_test_cros.TestNames.SelectDriveDestination);
     });
 
-// eslint-disable-next-line no-var
-var PrintPreviewDestinationSelectTestCrOSSaveToDriveEnabled =
-    class extends PrintPreviewTest {
-  /** @override */
-  get browsePreload() {
-    return 'chrome://print/test_loader.html?module=print_preview/destination_select_test_cros.js';
-  }
-
-  /** @override */
-  get suiteName() {
-    return destination_select_test_cros.suiteName;
-  }
-
-  /** @override */
-  get featureList() {
-    const kPrinterStatus = ['chromeos::features::kPrinterStatus'];
-    const kPrintSaveToDrive = ['chromeos::features::kPrintSaveToDrive'];
-    const featureList = super.featureList || [];
-    featureList.disabled = featureList.disabled ?
-        featureList.disabled.concat(kPrinterStatus) :
-        kPrinterStatus;
-    featureList.enabled = featureList.enabled ?
-        featureList.enabled.concat(kPrintSaveToDrive) :
-        kPrintSaveToDrive;
-    return featureList;
-  }
-};
-
-TEST_F(
-    'PrintPreviewDestinationSelectTestCrOSSaveToDriveEnabled',
-    'SelectDriveDestination', function() {
-      this.runMochaTest(
-          destination_select_test_cros.TestNames.SelectDriveDestination);
-    });
-
-TEST_F(
-    'PrintPreviewDestinationSelectTestCrOSSaveToDriveEnabled', 'ChangeIcon',
-    function() {
-      this.runMochaTest(destination_select_test_cros.TestNames.ChangeIcon);
-    });
-
-TEST_F(
-    'PrintPreviewDestinationSelectTestCrOSSaveToDriveEnabled',
-    'ChangeIconDeprecationWarnings', function() {
-      this.runMochaTest(
-          destination_select_test_cros.TestNames.ChangeIconDeprecationWarnings);
-    });
-
-TEST_F(
-    'PrintPreviewDestinationSelectTestCrOSSaveToDriveEnabled', 'IsDriveMounted',
-    function() {
-      this.runMochaTest(destination_select_test_cros.TestNames.IsDriveMounted);
-    });
-
 // eslint-disable-next-line no-var
 var PrintPreviewPrinterStatusTestCros = class extends PrintPreviewTest {
   /** @override */
@@ -1585,9 +1531,38 @@ TEST_F('PrintPreviewDestinationSettingsTest', 'NoDestinations', function() {
 });
 
 GEN('#if defined(OS_CHROMEOS)');
-TEST_F('PrintPreviewDestinationSettingsTest', 'EulaIsRetrieved', function() {
-  this.runMochaTest(destination_settings_test.TestNames.EulaIsRetrieved);
-});
+// eslint-disable-next-line no-var
+var PrintPreviewDestinationSettingsTestCros = class extends PrintPreviewTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://print/test_loader.html?module=print_preview/destination_settings_test.js';
+  }
+
+  /** @override */
+  get suiteName() {
+    return destination_settings_test.suiteName;
+  }
+
+  /** @override */
+  get featureList() {
+    const kPrintSaveToDrive = ['chromeos::features::kPrintSaveToDrive'];
+    const featureList = super.featureList || [];
+    featureList.enabled = featureList.enabled ?
+        featureList.enabled.concat(kPrintSaveToDrive) :
+        kPrintSaveToDrive;
+    return featureList;
+  }
+};
+
+TEST_F(
+    'PrintPreviewDestinationSettingsTestCros', 'EulaIsRetrieved', function() {
+      this.runMochaTest(destination_settings_test.TestNames.EulaIsRetrieved);
+    });
+
+TEST_F(
+    'PrintPreviewDestinationSettingsTestCros', 'DriveIsNotMounted', function() {
+      this.runMochaTest(destination_settings_test.TestNames.DriveIsNotMounted);
+    });
 GEN('#endif');
 
 // eslint-disable-next-line no-var