| Index: chrome/browser/ui/search/local_ntp_browsertest.cc
|
| diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
|
| index 19cf564b755f0604a48510c4dce258c955d78887..77f03395c62c648cce469f3d1f2c639cfa9f6e98 100644
|
| --- a/chrome/browser/ui/search/local_ntp_browsertest.cc
|
| +++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
|
| @@ -22,7 +22,6 @@ class LocalNTPTest : public InProcessBrowserTest,
|
|
|
| protected:
|
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - chrome::EnableInstantExtendedAPIForTesting();
|
| ASSERT_TRUE(https_test_server().Start());
|
| GURL instant_url = https_test_server().GetURL(
|
| "files/local_ntp_browsertest.html?strk=1&");
|
| @@ -49,13 +48,9 @@ IN_PROC_BROWSER_TEST_F(LocalNTPTest, DISABLED_LocalNTPJavascriptTest) {
|
| EXPECT_TRUE(success);
|
| }
|
|
|
| -// Flaky on Linux Tests bot.
|
| -#if defined(OS_LINUX)
|
| -#define MAYBE_NTPRespectsBrowserLanguageSetting DISABLED_NTPRespectsBrowserLanguageSetting
|
| -#else
|
| -#define MAYBE_NTPRespectsBrowserLanguageSetting NTPRespectsBrowserLanguageSetting
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(LocalNTPTest, MAYBE_NTPRespectsBrowserLanguageSetting) {
|
| +// Flaky.
|
| +IN_PROC_BROWSER_TEST_F(LocalNTPTest,
|
| + DISABLED_NTPRespectsBrowserLanguageSetting) {
|
| // Make sure the default language is not French.
|
| std::string default_locale = g_browser_process->GetApplicationLocale();
|
| EXPECT_NE("fr", default_locale);
|
|
|