Sync 3rd party wallpaper app name

chrome/browser/resources/chromeos/wallpaper_manager/js/util.js

 // Copyright (c) 2013 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.
 
 var WallpaperUtil = {
   strings: null,  // Object that contains all the flags
   syncFs: null,   // syncFileSystem handler
   webkitFs: null  // webkitFileSystem handler
 };
 
@@ skipping 241 matching lines @@
               reader.result,
               wallpaperLayout,
               true,
               wallpaperFilename,
               function(thumbnailData) {
                 // TODO(ranj): Ignore 'canceledWallpaper' error.
                 if (chrome.runtime.lastError) {
                   console.error(chrome.runtime.lastError.message);
                   return;
                 }
-                WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
-                    reader.result, Constants.WallpaperDirNameEnum.ORIGINAL);
-                WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
-                    thumbnailData, Constants.WallpaperDirNameEnum.THUMBNAIL);
+                // If the current synced wallpaper is a third party wallpaper,
+                // we also sync the third party app's name. Otherwise, we save
+                // the custom wallpaper to the local filesystem.
+                if (wallpaperFilename.indexOf(

[tbarzic, 2016/01/28 20:10:48]

do you really need to branch here?
Can't you just set the app name from the sync fs (it should already be '' for
1st party app)?

[xdai1, 2016/02/02 01:19:42]

Use value from sync fs instead.

+                    Constants.ThirdPartyWallpaperPrefix) != -1) {
+                  Constants.WallpaperSyncStorage.get(
+                      Constants.AccessSyncThirdPartyAppName, function(items) {
+                    if (items.hasOwnProperty(
+                        Constants.AccessSyncThirdPartyAppName)) {
+                      WallpaperUtil.saveToLocalStorage(
+                          Constants.AccessLocalThirdPartyAppName,
+                          items[Constants.AccessSyncThirdPartyAppName]);
+                    }
+                  });
+                } else {
+                  WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,

[tbarzic, 2016/01/28 20:10:48]

the wallpapers should still be stored to local fs if they came from the
component wallpaper app, right?

[xdai1, 2016/02/02 01:19:42]

Only custom wallpapers need to be stored in the local fs. Yes, the previous
behavior is incorrect. In my previous CL
https://codereview.chromium.org/1566713005, I just treat the third party
wallpaper as a normal custom wallpaper since the app name was unsyncable. This
CL is meant to address this issue as well.

+                      reader.result, Constants.WallpaperDirNameEnum.ORIGINAL);
+                  WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
+                      thumbnailData, Constants.WallpaperDirNameEnum.THUMBNAIL);
+                  WallpaperUtil.clearThirdPartyAppName();
+                }
                 if (onSuccess)
                   onSuccess();
               });
         };
         reader.readAsArrayBuffer(file);
       }, WallpaperUtil.onFileSystemError);
     }, function(e) {}  // fail to read file, expected due to download delay
     );
   };
   WallpaperUtil.requestSyncFS(setWallpaperFromSyncCallback);
 };
 
 /**
+ * Save the third party wallpaper app name to local & sync filesystem.
+ * @param {string} appname The third party wallpaper extension or app's name.
+ */
+WallpaperUtil.saveThirdPartyAppName = function(appname) {
+  WallpaperUtil.saveToLocalStorage(Constants.AccessLocalThirdPartyAppName,
+                                   appname, function() {
+    WallpaperUtil.saveToSyncStorage(Constants.AccessSyncThirdPartyAppName,
+                                    appname);
+});
+};
+
+/**
+ * Clear the third party wallpaper app name from local & sync filesystem.
+ */
+WallpaperUtil.clearThirdPartyAppName = function() {
+  WallpaperUtil.saveToLocalStorage(Constants.AccessLocalThirdPartyAppName, '',

[tbarzic, 2016/01/28 20:10:48]

WallpaperUtil.saveThirdPartyAppName('');

[xdai1, 2016/02/02 01:19:42]

Done.

+                                   function() {
+    WallpaperUtil.saveToSyncStorage(Constants.AccessSyncThirdPartyAppName, '');
+  });
+};
+
+/**
  * Saves value to local storage that associates with key.
  * @param {string} key The key that associates with value.
  * @param {string} value The value to save to local storage.
  * @param {function=} opt_callback The callback on success.
  */
 WallpaperUtil.saveToLocalStorage = function(key, value, opt_callback) {
   var items = {};
   items[key] = value;
   Constants.WallpaperLocalStorage.set(items, opt_callback);
 };
@@ skipping 85 matching lines @@
       onSuccess();
       return;
     }
 
     self.fetchURL(url, 'arraybuffer', function(xhr) {
       if (xhr.response != null) {
         chrome.wallpaperPrivate.setWallpaper(xhr.response, layout, url,
                                              onSuccess);
         self.saveWallpaperInfo(url, layout,
                                Constants.WallpaperSourceEnum.Online);
+        WallpaperUtil.clearThirdPartyAppName();
       } else {
         onFailure();
       }
     }, onFailure);
   });
 };
 
 /**
  * Runs chrome.test.sendMessage in test environment. Does nothing if running
  * in production environment.
  *
  * @param {string} message Test message to send.
  */
 WallpaperUtil.testSendMessage = function(message) {
   var test = chrome.test || window.top.chrome.test;
   if (test)
     test.sendMessage(message);
 };