summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/browser_action_apitest.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 02:24:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 02:24:34 +0000
commit65883fe73a0cff26a343dc54c659661d7a25d99f (patch)
tree4bef901c6611a4f2d3a76deacd206c615f9fcc9c /chrome/browser/extensions/browser_action_apitest.cc
parent3bb087d917883b1733e9a5b57ed110fe734821c7 (diff)
downloadchromium_src-65883fe73a0cff26a343dc54c659661d7a25d99f.zip
chromium_src-65883fe73a0cff26a343dc54c659661d7a25d99f.tar.gz
chromium_src-65883fe73a0cff26a343dc54c659661d7a25d99f.tar.bz2
Revert 34794 and 34779. Too much red.
TBR=mpcomplete@chromium.org BUG=30507 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_action_apitest.cc')
-rw-r--r--chrome/browser/extensions/browser_action_apitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 3814255..30bcd50 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -38,7 +38,7 @@ class BrowserActionApiTest : public ExtensionApiTest {
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
StartHTTPServer();
- ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
+ ASSERT_TRUE(RunExtensionTest("browser_action")) << message_;
// Test that there is a browser action in the toolbar.
ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
}
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
- ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
+ ASSERT_TRUE(RunExtensionTest("browser_action_no_icon")) << message_;
// Test that there is a browser action in the toolbar and that it has no icon.
ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
}
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
- ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
+ ASSERT_TRUE(RunExtensionTest("browser_action_tab_specific_state")) <<
message_;
// Test that there is a browser action in the toolbar and that it has an icon.