Migrate window.localStorage settings to chrome.storage.local at start-up.

remoting/webapp/remoting.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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @type {remoting.HostSession} */ remoting.hostSession = null;
@@ skipping 16 matching lines @@
     authContinue();
   };
   dialog.hidden = false;
   button.addEventListener('click', consentGranted, false);
 }
 
 /**
  * Entry point for app initialization.
  */
 remoting.init = function() {
+  migrateSettings_();

[Wez, 2013/04/04 18:51:40]

nit: migrateLocalToChromeStorage_()?

[Jamie, 2013/04/04 19:23:39]

Done.

+
   // TODO(jamiewalch): Remove this when we migrate to apps v2
   // (http://crbug.com/ 134213).
   remoting.initMockStorage();
 
   remoting.logExtensionInfo_();
   l10n.localize();
   // Create global objects.
   remoting.settings = new remoting.Settings();
   remoting.oauth2 = new remoting.OAuth2();
   // TODO(jamiewalch): Reinstate this when we migrate to apps v2
@@ skipping 302 matching lines @@
     } else {
       chrome.windows.get(tab.windowId, null, windowCallback);
     }
   };
   if (chrome.tabs) {
     chrome.tabs.getCurrent(tabCallback);
   } else {
     console.error('chome.tabs is not available.');
   }
 }
+
+function migrateSettings_() {
+  // The OAuth2 class still uses window.localStorage, so don't migrate any of
+  // those settings.

[Wez, 2013/04/04 18:51:40]

nit: I'd suggest rewording to explain that we're migrating all settings from
localStorage to chrome.storage.local, except for the OAuth2 settings.

[Jamie, 2013/04/04 19:23:39]

I've added a doc comment to the function to explain its purpose.

+  var oauthSettings = [
+      'oauth2-refresh-token',
+      'oauth2-refresh-token-revokable',
+      'oauth2-access-token',
+      'oauth2-xsrf-token',
+      'remoting-email'
+  ];
+  for (var setting in window.localStorage) {
+    if (oauthSettings.indexOf(setting) == -1) {
+      var copy = {}
+      copy[setting] = window.localStorage.getItem(setting);
+      chrome.storage.local.set(copy);

[Wez, 2013/04/04 18:51:40]

nit: You could collate the values to copy and do a single set(), and then run a
second iteration, this time over the copy object, deleting the values from
localStorage.

[Jamie, 2013/04/04 19:23:39]

I don't think that would be any clearer.

+      window.localStorage.removeItem(setting);
+    }
+  }
+}