Fix JS errors for Cellular

chrome/browser/resources/options/chromeos/internet_detail.js

 // Copyright (c) 2012 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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
@@ skipping 762 matching lines @@
       var apnList = onc.getActiveValue('Cellular.APNList');
       for (var i = 0; i < apnList.length; i++) {
         var apnDict = apnList[i];
         var option = document.createElement('option');
         var localizedName = apnDict['LocalizedName'];
         var name = localizedName ? localizedName : apnDict['Name'];
         var accessPointName = apnDict['AccessPointName'];
         option.textContent =
             name ? (name + ' (' + accessPointName + ')') : accessPointName;
         option.value = i;
-        // If this matches the active Apn, or LastGoodApn, set it as the
-        // selected Apn.
+        // Insert new option before "other" option.
+        apnSelector.add(option, otherOption);
+        if (this.selectedApnIndex_ != -1)
+          continue;
+        // If this matches the active Apn, or LastGoodApn (or there is no last
+        // good APN), set it as the selected Apn.
         if ((activeApn == accessPointName &&
-            activeUsername == apnDict['Username'] &&
-            activePassword == apnDict['Password']) ||
+             activeUsername == apnDict['Username'] &&
+             activePassword == apnDict['Password']) ||
+            (!activeApn && !lastGoodApn) ||
             (!activeApn &&
-            lastGoodApn == accessPointName &&
-            lastGoodUsername == apnDict['Username'] &&
-            lastGoodPassword == apnDict['Password'])) {
+             lastGoodApn == accessPointName &&
+             lastGoodUsername == apnDict['Username'] &&
+             lastGoodPassword == apnDict['Password'])) {
           this.selectedApnIndex_ = i;
         }
-        // Insert new option before "other" option.
-        apnSelector.add(option, otherOption);
       }
       if (this.selectedApnIndex_ == -1 && activeApn) {
         var activeOption = document.createElement('option');
         activeOption.textContent = activeApn;
         activeOption.value = -1;
         apnSelector.add(activeOption, otherOption);
         this.selectedApnIndex_ = apnSelector.length - 2;
         this.userApnIndex_ = this.selectedApnIndex_;
       }
       assert(this.selectedApnIndex_ >= 0);
@@ skipping 747 matching lines @@
       $('auto-connect-network-vpn').disabled = false;
     } else {
       OptionsPage.showTab($('internet-nav-tab'));
     }
 
     // Update controlled option indicators.
     var indicators = cr.doc.querySelectorAll(
         '#details-internet-page .controlled-setting-indicator');
     for (var i = 0; i < indicators.length; i++) {
       var managed = indicators[i].hasAttribute('managed');
+      // TODO(stevenjb): Eliminate support for 'data' once 39 is stable.
       var attributeName = managed ? 'managed' : 'data';
       var propName = indicators[i].getAttribute(attributeName);
       if (!propName)
         continue;
       var propValue = managed ?
           onc.getManagedProperty(propName) :
           onc.getActiveValue(propName);
-      if (propValue == undefined)
+      // If the property is unset or unmanaged (i.e. not an Object) skip it.
+      if (propValue == undefined || (typeof propValue != 'object'))
         continue;
-      propValue = assertInstanceof(propValue, Object);
       var event;
       if (managed)
         event = detailsPage.createManagedEvent_(propName, propValue);
       else
         event = detailsPage.createControlledEvent_(propName,
             /** @type {{value: *, controlledBy: *, recommendedValue: *}} */(
                 propValue));
       indicators[i].handlePrefChange(event);
       var forElement = $(indicators[i].getAttribute('for'));
       if (forElement) {
         if (event.value.controlledBy == 'policy')
           forElement.disabled = true;
         if (forElement.resetHandler)
           indicators[i].resetHandler = forElement.resetHandler;
       }
     }
 
     detailsPage.updateControls();
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });