Extension API Renaming/Consistency changes

chrome/renderer/extensions/extension_api_client_unittest.cc

 // Copyright (c) 2009 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.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
@@ skipping 139 matching lines @@
 
   ExpectJsFail("chrome.windows.getLastFocused('abc');",
                "Uncaught Error: Invalid value for argument 0. "
                "Expected 'function' but got 'string'.");
 
   ExpectJsPass("chrome.windows.getLastFocused(function(){})",
                "windows.getLastFocused", "null");
 }
 
 TEST_F(ExtensionAPIClientTest, GetAllWindows) {
-  ExpectJsFail("chrome.windows.getAll(true, function(){}, 20);",
+  ExpectJsFail("chrome.windows.getAll({populate: true}, function(){}, 20);",
                "Uncaught Error: Too many arguments.");
 
   ExpectJsFail("chrome.windows.getAll(1, function(){});",
                "Uncaught Error: Invalid value for argument 0. "
-               "Expected 'boolean' but got 'integer'.");
+               "Expected 'object' but got 'integer'.");
 
-  ExpectJsPass("chrome.windows.getAll(true, function(){})",
-               "windows.getAll", "true");
+  ExpectJsPass("chrome.windows.getAll({populate:true}, function(){})",
+               "windows.getAll", "{\"populate\":true}");
 
   ExpectJsPass("chrome.windows.getAll(null, function(){})",
                "windows.getAll", "null");
 
+  ExpectJsPass("chrome.windows.getAll({}, function(){})",
+               "windows.getAll", "{}");
+
   ExpectJsPass("chrome.windows.getAll(undefined, function(){})",
                "windows.getAll", "null");
 }
 
 TEST_F(ExtensionAPIClientTest, CreateWindow) {
   ExpectJsFail("chrome.windows.create({url: 1}, function(){});",
                "Uncaught Error: Invalid value for argument 0. Property "
                "'url': Expected 'string' but got 'integer'.");
   ExpectJsFail("chrome.windows.create({left: 'foo'}, function(){});",
                "Uncaught Error: Invalid value for argument 0. Property "
@@ skipping 345 matching lines @@
                            "\"title\":\"a\",\"iconId\":0}]");
 
   // Now try disablePageAction.
   ExpectJsPass("chrome.pageActions.disableForTab("
                "'dummy', {tabId: 0, url: 'http://foo/'});",
                "pageActions.disableForTab",
                "[\"dummy\",{\"tabId\":0,\"url\":\"http://foo/\"}]");
 }
 
 TEST_F(ExtensionAPIClientTest, ExpandToolstrip) {
-  ExpectJsPass("chrome.toolstrip.expand(100, 'http://foo/')",
+  ExpectJsPass("chrome.toolstrip.expand({height:100, url:'http://foo/'})",
                "toolstrip.expand",
-               "[100,\"http://foo/\"]");
-  ExpectJsPass("chrome.toolstrip.expand(100, null)",
+               "{\"height\":100,\"url\":\"http://foo/\"}");
+  ExpectJsPass("chrome.toolstrip.expand({height:100}, null)",
                "toolstrip.expand",
-               "[100,null]");
-  ExpectJsPass("chrome.toolstrip.expand(100, 'http://foo/', function(){})",
+               "{\"height\":100}");
+  ExpectJsPass("chrome.toolstrip.expand({height:100,url:'http://foo/'}, "
+                   "function(){})",
                "toolstrip.expand",
-               "[100,\"http://foo/\"]");
+               "{\"height\":100,\"url\":\"http://foo/\"}");
 
-  ExpectJsFail("chrome.toolstrip.expand('100', 'http://foo/')",
+
+  ExpectJsFail("chrome.toolstrip.expand()",
+               "Uncaught Error: Parameter 0 is required.");
+  ExpectJsFail("chrome.toolstrip.expand(1)",
                "Uncaught Error: Invalid value for argument 0. "
+               "Expected 'object' but got 'integer'.");
+  ExpectJsFail("chrome.toolstrip.expand({height:'100', url:'http://foo/'})",
+               "Uncaught Error: Invalid value for argument 0. "
+                   "Property 'height': "
                "Expected 'integer' but got 'string'.");
-  ExpectJsFail("chrome.toolstrip.expand(100, 100)",
+  ExpectJsFail("chrome.toolstrip.expand({height:100,url:100})",
+               "Uncaught Error: Invalid value for argument 0. Property 'url': "
+               "Expected 'string' but got 'integer'.");
+  ExpectJsFail("chrome.toolstrip.expand({height:100,'url':'http://foo/'}, 32)",
                "Uncaught Error: Invalid value for argument 1. "
-               "Expected 'string' but got 'integer'.");
-  ExpectJsFail("chrome.toolstrip.expand(100, 'http://foo/', 32)",
-               "Uncaught Error: Invalid value for argument 2. "
                "Expected 'function' but got 'integer'.");
 }
 
 TEST_F(ExtensionAPIClientTest, CollapseToolstrip) {
-  ExpectJsPass("chrome.toolstrip.collapse('http://foo/')",
+  ExpectJsPass("chrome.toolstrip.collapse({url:'http://foo/'})",
                "toolstrip.collapse",
-               "\"http://foo/\"");
+               "{\"url\":\"http://foo/\"}");
   ExpectJsPass("chrome.toolstrip.collapse(null)",
                "toolstrip.collapse",
                "null");
-  ExpectJsPass("chrome.toolstrip.collapse('http://foo/', function(){})",
+  ExpectJsPass("chrome.toolstrip.collapse({url:'http://foo/'}, function(){})",
                "toolstrip.collapse",
-               "\"http://foo/\"");
+               "{\"url\":\"http://foo/\"}");
 
+  ExpectJsFail("chrome.toolstrip.collapse(1)",
+               "Uncaught Error: Invalid value for argument 0. "
+               "Expected 'object' but got 'integer'.");
   ExpectJsFail("chrome.toolstrip.collapse(100)",
                "Uncaught Error: Invalid value for argument 0. "
-               "Expected 'string' but got 'integer'.");
-  ExpectJsFail("chrome.toolstrip.collapse('http://foo/', 32)",
+               "Expected 'object' but got 'integer'.");
+  ExpectJsFail("chrome.toolstrip.collapse({url:'http://foo/'}, 32)",
                "Uncaught Error: Invalid value for argument 1. "
                "Expected 'function' but got 'integer'.");
 }