Include more extension browser tests on mac and linux. Some minor changes and reorganization.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/504064

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

4 files changed, 7 insertions, 9 deletions

diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 6b9822b..51d58dd 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/views/extensions/extension_shelf.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
-
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/notification_service.h"
@@ -223,12 +222,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TabContents) {
 // keep these from working
 #define MAYBE_PageAction DISABLED_PageAction
 #define MAYBE_UnloadPageAction DISABLED_UnloadPageAction
-#define MAYBE_TitleLocalizationBrowserAction DISABLED_TitleLocalizationBrowserAction
 #define MAYBE_TitleLocalizationPageAction DISABLED_TitleLocalizationPageAction
 #else
 #define MAYBE_PageAction PageAction
 #define MAYBE_UnloadPageAction UnloadPageAction
-#define MAYBE_TitleLocalizationBrowserAction TitleLocalizationBrowserAction
 #define MAYBE_TitleLocalizationPageAction TitleLocalizationPageAction
 #endif
 
@@ -280,7 +277,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_UnloadPageAction) {
 
 // Tests that tooltips of a browser action icon can be specified using UTF8.
 // See http://crbug.com/25349.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_TitleLocalizationBrowserAction) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) {
   FilePath extension_path(test_data_dir_.AppendASCII("browsertest")
                                         .AppendASCII("title_localized"));
   ASSERT_TRUE(LoadExtension(extension_path));
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc
index d030fd1..28e9211 100644
--- a/chrome/browser/extensions/extension_devtools_browsertests.cc
+++ b/chrome/browser/extensions/extension_devtools_browsertests.cc
@@ -16,8 +16,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/extensions/extension_shelf.h"
-#include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_unittest.cc
index 2ec4701..19be2c7 100644
--- a/chrome/browser/extensions/extension_startup_unittest.cc
+++ b/chrome/browser/extensions/extension_startup_unittest.cc
@@ -159,12 +159,10 @@ class ExtensionsStartupTest : public ExtensionStartupTestBase {
   }
 };
 
-#if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, Test) {
   WaitForServicesToStart(3, true);
   TestInjection(true, true);
 }
-#endif  // defined(OS_WIN)
 
 // ExtensionsLoadTest
 // Ensures that we can startup the browser with --load-extension and see them
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 427f6cf..b5ad2ab 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -4,7 +4,12 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsBasics) {
   StartHTTPServer();
   ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_;
 }
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsConnect) {
+  StartHTTPServer();
+  ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_;
+}