summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/browser_action_apitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/browser_action_apitest.cc')
-rw-r--r--chrome/browser/extensions/browser_action_apitest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 30bcd50..1713b23 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")) << message_;
+ ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << 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.
@@ -136,7 +136,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
// TODO(estade): http://crbug.com/29710 port to Mac & Linux
#if defined(OS_WIN)
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) {
- ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("popup")));
+ ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
+ "browser_action/popup")));
ResultCatcher catcher;