1 files changed, 20 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 427f6cf..7ab30b4 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -4,7 +4,26 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
+#include "chrome/browser/browser.h"
+#include "chrome/browser/pref_service.h"
+#include "chrome/browser/profile.h"
+#include "chrome/common/pref_names.h"
+
+// TODO(skerner): This test is flaky in chromeos.  Figure out why and fix.
+#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#define MAYBE_Tabs DISABLED_Tabs
+#else
+#define MAYBE_Tabs Tabs
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
   StartHTTPServer();
+
+  // The test creates a tab and checks that the URL of the new tab
+  // is that of the new tab page.  Make sure the pref that controls
+  // this is set.
+  browser()->profile()->GetPrefs()->SetBoolean(
+      prefs::kHomePageIsNewTabPage, true);
+
   ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_;
 }