diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 19:43:56 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 19:43:56 +0000 |
| commit | ad6530c6ff2eca922cde2aaf47f0fb39a0e78051 (patch) | |
| tree | 05c2988cc0a12651a8a182b3e17342a0f0ee3b2c /chrome/browser/extensions/browser_action_apitest.cc | |
| parent | 0cc21e121a27b39ad0abda60021532171f99be53 (diff) | |
| download | chromium_src-ad6530c6ff2eca922cde2aaf47f0fb39a0e78051.zip chromium_src-ad6530c6ff2eca922cde2aaf47f0fb39a0e78051.tar.gz chromium_src-ad6530c6ff2eca922cde2aaf47f0fb39a0e78051.tar.bz2 | |
Reorganize api_tests directory.
This reapplies 34794 and 34779 with one additional fix,
which were reverted by 34798.
TBR=mpcomplete@chromium.org
BUG=30507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/browser_action_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 9 |
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; |