Disable FirstRunMasterPrefsWithTrackedPreferences.TrackedPreferencesSurviveFirstRun on Linux on off…

chrome/browser/first_run/first_run_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
@@ skipping 200 matching lines @@
     "  \"distribution\": {\n"
     "    \"import_bookmarks\": false,\n"
     "    \"import_history\": false,\n"
     "    \"import_home_page\": false,\n"
     "    \"import_search_engine\": false\n"
     "  }\n"
     "}\n";
 typedef FirstRunMasterPrefsBrowserTestT<kImportNothing>
     FirstRunMasterPrefsImportNothing;
 // http://crbug.com/314221
 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)

[gab, 2014/02/14 21:27:47]

Don't these import tests also fail on Linux?

[pshenoy, 2014/02/14 21:35:57]

Yes. Disabled on Linux too.

 #define MAYBE_ImportNothingAndShowNewTabPage \
     DISABLED_ImportNothingAndShowNewTabPage
 #else
 #define MAYBE_ImportNothingAndShowNewTabPage ImportNothingAndShowNewTabPage
 #endif
 IN_PROC_BROWSER_TEST_F(FirstRunMasterPrefsImportNothing,
                        MAYBE_ImportNothingAndShowNewTabPage) {
   EXPECT_EQ(first_run::AUTO_IMPORT_CALLED, first_run::auto_import_state());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,
@@ skipping 18 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     FirstRunMasterPrefsBrowserTestT::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         switches::kForceFieldTrials,
         std::string(chrome_prefs::internals::kSettingsEnforcementTrialName) +
             "/" + GetParam() + "/");
   }
 };
 
 // http://crbug.com/314221
-#if defined(GOOGLE_CHROME_BUILD) && defined(OS_MACOSX)
+#if defined(GOOGLE_CHROME_BUILD) && (defined(OS_MACOSX) || defined(OS_LINUX))
 #define MAYBE_TrackedPreferencesSurviveFirstRun \
     DISABLED_TrackedPreferencesSurviveFirstRun
 #else
 #define MAYBE_TrackedPreferencesSurviveFirstRun \
     TrackedPreferencesSurviveFirstRun
 #endif
 IN_PROC_BROWSER_TEST_P(FirstRunMasterPrefsWithTrackedPreferences,
                        MAYBE_TrackedPreferencesSurviveFirstRun) {
   const PrefService* user_prefs = browser()->profile()->GetPrefs();
   EXPECT_EQ("example.com", user_prefs->GetString(prefs::kHomePage));
@@ skipping 14 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     FirstRunMasterPrefsWithTrackedPreferencesInstance,
     FirstRunMasterPrefsWithTrackedPreferences,
     testing::Values(
         chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement,
         chrome_prefs::internals::kSettingsEnforcementGroupEnforceOnload,
         chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways));
 
 
 #endif  // !defined(OS_CHROMEOS)