remove toolstrips

BUG=51703
BUG=30178
BUG=25106
TEST=none

Review URL: http://codereview.chromium.org/3129003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55921 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 2 insertions, 403 deletions

diff --git a/chrome/test/data/extensions/api_test/README.txt b/chrome/test/data/extensions/api_test/README.txt
index a356855..06088f1 100644
--- a/chrome/test/data/extensions/api_test/README.txt
+++ b/chrome/test/data/extensions/api_test/README.txt
@@ -15,7 +15,7 @@ extension_bookmarks_apitest.cc for an example.
 
 (2) Create an extension of in this directory of the same name as the extension
 that your test referred to ("extension_name" above).  This test should load
-either a background page or a toolstrip which immediately starts its test.
+either a background page which immediately starts its test.
 
 (3) In your extension page, call chrome.test.runTests with an array of
 functions which represent your subtests.  Each of these functions will most
diff --git a/chrome/test/data/extensions/api_test/toolstrip/folder/relative.html b/chrome/test/data/extensions/api_test/toolstrip/folder/relative.html
deleted file mode 100644
index 9be5b62..0000000
--- a/chrome/test/data/extensions/api_test/toolstrip/folder/relative.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>

-/*

-chrome.toolstrip.onExpanded.addListener(function() {

-  chrome.test.log("relative expanded");

-});*/

-</script>

-relative

-

diff --git a/chrome/test/data/extensions/api_test/toolstrip/manifest.json b/chrome/test/data/extensions/api_test/toolstrip/manifest.json
deleted file mode 100644
index 63b5798..0000000
--- a/chrome/test/data/extensions/api_test/toolstrip/manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "chrome.toolstrip",
-  "version": "0.1",
-  "description": "end-to-end browser test for chrome.toolstrip API",
-  "toolstrips": ["test.html", "test2.html"]
-}
diff --git a/chrome/test/data/extensions/api_test/toolstrip/test.html b/chrome/test/data/extensions/api_test/toolstrip/test.html
deleted file mode 100644
index 985e751..0000000
--- a/chrome/test/data/extensions/api_test/toolstrip/test.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>

-chrome.test.runTests([

-  function expand() {

-    chrome.test.listenOnce(chrome.toolstrip.onExpanded, function(){});

-    chrome.toolstrip.expand({height:200}, 

-                            chrome.test.callbackPass(function(){}));

-  },

-  

-  function collapse() {

-    chrome.test.listenOnce(chrome.toolstrip.onCollapsed, function(){});

-    chrome.toolstrip.collapse({}, chrome.test.callbackPass(function(){}));

-  },

-  

-  /* TODO(mpcomplete): this is failing in part due to bug 21905

-  function expandOther() {

-    var orig = window.location;

-    var relative = "folder/relative.html";

-

-    // Get the other toolstrip.

-    var toolstrips = chrome.extension.getToolstrips();

-    var other = (toolstrips[0].location == location) ?

-        toolstrips[1] : toolstrips[0];

-

-    other.chrome.toolstrip.expand({height:200, url:relative},

-                                  chrome.test.callbackPass(function() {

-      // TODO(mpcomplete) this never gets called

-      chrome.test.log(other.location.toString());

-      chrome.test.listenOnce(other.onLoad, function() {

-        chrome.test.log(other.location.toString());

-        chrome.test.assertEq(other.location.toString(),

-                             chrome.extension.getURL(relative));

-        other.chrome.toolstrip.collapse({url:"../test2.html"},

-                                        chrome.test.callbackPass(function() {

-          chrome.test.assertEq(other.location.toString(), orig);

-        }));

-      });

-    }));

-  },

-  */

-]);

-</script>

-test
\ No newline at end of file
diff --git a/chrome/test/data/extensions/api_test/toolstrip/test2.html b/chrome/test/data/extensions/api_test/toolstrip/test2.html
deleted file mode 100644
index 957f4e4..0000000
--- a/chrome/test/data/extensions/api_test/toolstrip/test2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>

-chrome.toolstrip.onExpanded.addListener(function() {

-  chrome.test.log("test2 expanded");

-});

-chrome.toolstrip.onCollapsed.addListener(function() {

-  chrome.test.log("test2 collapsed");

-});

-</script>

-test2

diff --git a/chrome/test/data/extensions/browsertest/last_error/toolstrip.html b/chrome/test/data/extensions/browsertest/last_error/bg.html
index 6df972e..6df972e 100644
--- a/chrome/test/data/extensions/browsertest/last_error/toolstrip.html
+++ b/chrome/test/data/extensions/browsertest/last_error/bg.html
diff --git a/chrome/test/data/extensions/browsertest/last_error/manifest.json b/chrome/test/data/extensions/browsertest/last_error/manifest.json
index e0c6ad7..71bf252 100644
--- a/chrome/test/data/extensions/browsertest/last_error/manifest.json
+++ b/chrome/test/data/extensions/browsertest/last_error/manifest.json
@@ -2,6 +2,6 @@
   "name": "lastError",
   "description": "Used by browsertest to test the setting of lastError for callbacks.",
   "version": "0.1",
-  "toolstrips": ["toolstrip.html"],
+  "background_page": "bg.html",
   "permissions": ["tabs"]
 }
diff --git a/chrome/test/data/extensions/common/one_in_shelf/manifest.json b/chrome/test/data/extensions/common/one_in_shelf/manifest.json
deleted file mode 100644
index f714a17..0000000
--- a/chrome/test/data/extensions/common/one_in_shelf/manifest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": "Extension which has exactly one item in the shelf",
-  "name": "one_in_shelf",
-  "toolstrips": [
-    "shelf.html"
-  ],
-  "version": "0.1"
-}
\ No newline at end of file
diff --git a/chrome/test/data/extensions/common/one_in_shelf/shelf.html b/chrome/test/data/extensions/common/one_in_shelf/shelf.html
deleted file mode 100644
index e2a5d5a..0000000
--- a/chrome/test/data/extensions/common/one_in_shelf/shelf.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="toolstrip-button">Hello World!</div>
-
diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
index 7362c99..7f119e6 100644
--- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
@@ -7,14 +7,6 @@
     "128": "icon_128.png"
   },
   "default_locale": "en_US",
-  "toolstrips": [
-    {
-      "path": "toolstrip1.html",
-      "mole": "lorem_ipsum.html",
-      "mole_height": 200
-    },
-    "toolstrip2.html"
-  ],
   "background_page": "backgroundpage.html",
   "permissions": ["tabs", "http://*.google.com/*", "https://*.google.com/*"],
   "content_scripts": [
diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
deleted file mode 100644
index da7cdae..0000000
--- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<script>
-var isToolstrip = 1;
-// This function is called from the C++ browser test. It does a basic sanity
-// test that we can call extension APIs.
-function testTabsAPI() {
-  console.log(chrome.tabs);
-
-  chrome.tabs.getAllInWindow(null, function(tabs) {
-    window.domAutomationController.send(tabs.length == 1);
-  });
-}
-
-// This function is called from the C++ browser test. It tests the getLanguage
-// function to make sure it can be used as an extension API. This will pass if
-// the browser navigates to a page in French language before this is called.
-function testTabsLanguageAPI() {
-  chrome.tabs.detectLanguage(null, function(language) {
-    window.domAutomationController.send(language == 'fr');
-  });
-}
-
-// This function is called from the C++ browser test. It tests the getToolstrips
-// function to make sure it can be used as an extension API. This will pass if
-// getToolstrips returns all toolstrip views.
-function testgetToolstripsAPI() {
-  var views = chrome.extension.getToolstrips();
-  window.domAutomationController.send(views.length == 2 &&
-                                      views[0].isToolstrip == 1 &&
-                                      views[1].isToolstrip == 1);
-}
-
-// This function is called from the C++ browser test. It tests the
-// getBackgroundPage function to make sure it can be used as an extension API.
-// This will pass if getBackgroundPage returns background page view.
-function testgetBackgroundPageAPI() {
-  var view = chrome.extension.getBackgroundPage();
-  window.domAutomationController.send(view != null &&
-                                      view.isBackgroundPage == 1);
-}
-
-// This function is called from the C++ browser test. It tests the
-// getExtensionTabs function to make sure it can be used as an extension API.
-// This will pass if getExtensionTabs returns tabcontent view.
-function testgetExtensionTabsAPI() {
-  var views = chrome.extension.getExtensionTabs();
-  // getTabContentses is here for backwards compatibility
-  var views2 = chrome.extension.getTabContentses();
-  window.domAutomationController.send(views.length == 1 &&
-                                      views[0].isTabContents == 1 &&
-                                      views2.length == 1 &&
-                                      views2[0].isTabContents == 1);
-}
-
-</script>
-<select>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-</select>
diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html
deleted file mode 100644
index 2f0bc54..0000000
--- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip2.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-  var isToolstrip = 1;
-</script>
-<button onclick="window.open('http://www.google.com', 'mywindow', 'width=640, height=480');">HTML button</button>
diff --git a/chrome/test/data/extensions/good/Preferences b/chrome/test/data/extensions/good/Preferences
index 6d5c369..fc5524c 100644
--- a/chrome/test/data/extensions/good/Preferences
+++ b/chrome/test/data/extensions/good/Preferences
@@ -15,14 +15,6 @@
                 "128": "icon_128.png"
               },
               "default_locale": "en_US",
-              "toolstrips": [
-                {
-                  "path": "toolstrip1.html",
-                  "mole": "lorem_ipsum.html",
-                  "mole_height": 200
-                },
-                "toolstrip2.html"
-              ],
               "background_page": "backgroundpage.html",
               "permissions": ["tabs", "http://*.google.com/*", "https://*.google.com/*"],
               "content_scripts": [
diff --git a/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
deleted file mode 100644
index 94c0e712..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB",
-  "version": "1.0.0.0",
-  "name": "1 toolstrip",
-  "toolstrips": [
-    "toolstrip1.html"
-  ]
-}
diff --git a/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html b/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
deleted file mode 100644
index d45660f..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<select>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-</select>
diff --git a/chrome/test/data/extensions/profiles/toolstrips1/Default/Preferences b/chrome/test/data/extensions/profiles/toolstrips1/Default/Preferences
deleted file mode 100644
index a9b9760..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips1/Default/Preferences
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-   "download": {
-      "directory_upgrade": true,
-      "extensions_to_open": ""
-   },
-   "extensions": {
-      "autoupdate": {
-         "next_check": "12897640036342487"
-      },
-      "settings": {
-         "behllobkkfkfnphdnhnkndlbkcpglgmj": {
-            "location": 1,
-            "manifest":
-            {
-              "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB",
-              "version": "1.0.0.0",
-              "name": "1 toolstrip",
-              "toolstrips": [
-                "toolstrip1.html"
-              ]
-            },
-            "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0",
-            "state": 1
-         }
-      }
-   },
-   "profile": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "",
-      "nickname": ""
-   },
-   "session": {
-      "urls_to_restore_on_startup": [  ]
-   }
-}
diff --git a/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
deleted file mode 100644
index 2053464..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB",
-  "version": "1.0.0.0",
-  "name": "50 toolstrips",
-  "toolstrips": [
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html",
-    "toolstrip1.html"
-  ]
-}
diff --git a/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html b/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
deleted file mode 100644
index d45660f..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips50/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/toolstrip1.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<select>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-</select>
diff --git a/chrome/test/data/extensions/profiles/toolstrips50/Default/Preferences b/chrome/test/data/extensions/profiles/toolstrips50/Default/Preferences
deleted file mode 100644
index d4b478c..0000000
--- a/chrome/test/data/extensions/profiles/toolstrips50/Default/Preferences
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-   "download": {
-      "directory_upgrade": true,
-      "extensions_to_open": ""
-   },
-   "extensions": {
-      "autoupdate": {
-         "next_check": "12897640036342487"
-      },
-      "settings": {
-         "behllobkkfkfnphdnhnkndlbkcpglgmj": {
-            "location": 1,
-            "manifest":
-            {
-              "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB",
-              "version": "1.0.0.0",
-              "name": "50 toolstrips",
-              "toolstrips": [
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html",
-                "toolstrip1.html"
-              ]
-            },
-            "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0",
-            "state": 1
-         }
-      }
-   },
-   "profile": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "",
-      "nickname": ""
-   },
-   "session": {
-      "urls_to_restore_on_startup": [  ]
-   }
-}
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index e33e113..1422e49 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -79,9 +79,6 @@ class StartupTest : public UITest {
     data_dir = data_dir.AppendASCII("extensions").AppendASCII("profiles").
         AppendASCII(profile);
     set_template_user_data(data_dir);
-
-    // For now, these tests still depend on toolstrips.
-    launch_arguments_.AppendSwitch(switches::kEnableExtensionToolstrips);
   }
 
   // Runs a test which loads |tab_count| tabs on startup, either as command line
@@ -343,20 +340,6 @@ TEST_F(StartupTest, PerfExtensionEmpty) {
                  UITest::DEFAULT_THEME, 1, 0);
 }
 
-TEST_F(StartupTest, PerfExtensionToolstrips1) {
-  SetUpWithFileURL();
-  SetUpWithExtensionsProfile("toolstrips1");
-  RunStartupTest("warm", "extension_toolstrip1", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
-}
-
-TEST_F(StartupTest, PerfExtensionToolstrips50) {
-  SetUpWithFileURL();
-  SetUpWithExtensionsProfile("toolstrips50");
-  RunStartupTest("warm", "extension_toolstrip50", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
-}
-
 TEST_F(StartupTest, PerfExtensionContentScript1) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts1");
diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h
index 878bf72..d35e04c 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/test_browser_window.h
@@ -30,7 +30,6 @@ class TestBrowserWindow : public BrowserWindow {
   virtual BrowserWindowTesting* GetBrowserWindowTesting() { return NULL; }
   virtual StatusBubble* GetStatusBubble() { return NULL; }
   virtual void SelectedTabToolbarSizeChanged(bool is_animating) {}
-  virtual void SelectedTabExtensionShelfSizeChanged() {}
   virtual void UpdateTitleBar() {}
   virtual void ShelfVisibilityChanged() {}
   virtual void UpdateDevTools() {}
@@ -71,7 +70,6 @@ class TestBrowserWindow : public BrowserWindow {
   virtual void ConfirmAddSearchProvider(const TemplateURL* template_url,
                                         Profile* profile) {}
   virtual void ToggleBookmarkBar() {}
-  virtual void ToggleExtensionShelf() {}
   virtual views::Window* ShowAboutChromeDialog() { return NULL; }
   virtual void ShowUpdateChromeDialog() {}
   virtual void ShowTaskManager() {}