change chrome.wallpaper.setWallpaper api

change field name from wallpaperData to data
change field name from name to filename

BUG=411286

Review URL: https://codereview.chromium.org/559583002

Cr-Commit-Position: refs/heads/master@{#294181}

chrome/browser/chromeos/extensions/wallpaper_api.cc

@@ -104,8 +104,8 @@ bool WallpaperSetWallpaperFunction::RunAsync() {
   user_id_hash_ =
       user_manager::UserManager::Get()->GetLoggedInUser()->username_hash();
 
-  if (params_->details.wallpaper_data) {
-    StartDecode(*params_->details.wallpaper_data);
+  if (params_->details.data) {
+    StartDecode(*params_->details.data);
   } else {
     GURL wallpaper_url(*params_->details.url);
     if (wallpaper_url.is_valid()) {
@@ -127,7 +127,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
   base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
       chromeos::kThumbnailWallpaperSubDir,
       user_id_hash_,
-      params_->details.name);
+      params_->details.filename);
 
   sequence_token_ = BrowserThread::GetBlockingPool()->
       GetNamedSequenceToken(chromeos::kWallpaperSequenceTokenName);
@@ -141,7 +141,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
       user_id_ == user_manager::UserManager::Get()->GetActiveUser()->email();
   wallpaper_manager->SetCustomWallpaper(user_id_,
                                         user_id_hash_,
-                                        params_->details.name,
+                                        params_->details.filename,
                                         layout,
                                         user_manager::User::CUSTOMIZED,
                                         image,
@@ -209,8 +209,8 @@ void WallpaperSetWallpaperFunction::OnWallpaperFetched(
     bool success,
     const std::string& response) {
   if (success) {
-    params_->details.wallpaper_data.reset(new std::string(response));
-    StartDecode(*params_->details.wallpaper_data);
+    params_->details.data.reset(new std::string(response));
+    StartDecode(*params_->details.data);
   } else {
     SetError(response);
     SendResponse(false);

chrome/common/extensions/api/wallpaper.json

@@ -20,7 +20,7 @@
           "name": "details",
           "type": "object",
           "properties": {
-            "wallpaperData": {
+            "data": {
               "type": "binary",
               "optional": true,
               "description": "The jpeg or png encoded wallpaper image."
@@ -35,7 +35,7 @@
               "enum": [ "STRETCH", "CENTER", "CENTER_CROPPED" ],
               "description": "The supported wallpaper layouts."
             },
-            "name": {
+            "filename": {
               "type": "string",
               "description": "The file name of the saved wallpaper."
             },

chrome/common/extensions/docs/templates/intros/wallpaper.html

@@ -25,6 +25,6 @@ chrome.wallpaper.setWallpaper(
     {
       'url': 'http://example.com/a_file.jpg',
       'layout': 'CENTER_CROPPED',
-      'name': 'test_wallpaper'
+      'filename': 'test_wallpaper'
     }, function() {});
 </pre>

chrome/test/data/extensions/api_test/wallpaper/test.js

@@ -25,9 +25,9 @@ chrome.test.getConfig(function(config) {
       wallpaperRequest.onloadend = function(e) {
         if (wallpaperRequest.status === 200) {
           chrome.wallpaper.setWallpaper(
-              {'wallpaperData': wallpaperRequest.response,
+              {'data': wallpaperRequest.response,
                'layout': 'CENTER_CROPPED',
-               'name': 'test'},
+               'filename': 'test'},
               // Set wallpaper directly with an arraybuffer should pass.
               pass()
           );
@@ -56,7 +56,7 @@ chrome.test.getConfig(function(config) {
       chrome.wallpaper.setWallpaper(
           {'url': url,
            'layout': 'CENTER_CROPPED',
-           'name': 'test'},
+           'filename': 'test'},
            // A valid url should set wallpaper correctly.
            pass()
       );
@@ -68,7 +68,7 @@ chrome.test.getConfig(function(config) {
       chrome.wallpaper.setWallpaper(
          {'url': url,
           'layout': 'CENTER_CROPPED',
-          'name': 'test'},
+          'filename': 'test'},
           // Expect a failure.
           fail(optExpectedError));
     }