Rolling back change 22245.

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 500 matching lines @@
                "pageActions.enableForTab",
                "[\"dummy\",{\"tabId\":0,\"url\":\"http://foo/\","
                            "\"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/')",
-               "toolstrip.expand",
-               "[100,\"http://foo/\"]");
-  ExpectJsPass("chrome.toolstrip.expand(100, null)",
-               "toolstrip.expand",
-               "[100,null]");
-  ExpectJsPass("chrome.toolstrip.expand(100, 'http://foo/', function(){})",
-               "toolstrip.expand",
-               "[100,\"http://foo/\"]");
-
-  ExpectJsFail("chrome.toolstrip.expand('100', 'http://foo/')",
-               "Uncaught Error: Invalid value for argument 0. "
-               "Expected 'integer' but got 'string'.");
-  ExpectJsFail("chrome.toolstrip.expand(100, 100)",
-               "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/')",
-               "toolstrip.collapse",
-               "\"http://foo/\"");
-  ExpectJsPass("chrome.toolstrip.collapse(null)",
-               "toolstrip.collapse",
-               "null");
-  ExpectJsPass("chrome.toolstrip.collapse('http://foo/', function(){})",
-               "toolstrip.collapse",
-               "\"http://foo/\"");
-
-  ExpectJsFail("chrome.toolstrip.collapse(100)",
-               "Uncaught Error: Invalid value for argument 0. "
-               "Expected 'string' but got 'integer'.");
-  ExpectJsFail("chrome.toolstrip.collapse('http://foo/', 32)",
-               "Uncaught Error: Invalid value for argument 1. "
-               "Expected 'function' but got 'integer'.");
-}