diff options
| -rw-r--r-- | chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc index 9bd334e..72c73d6 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc @@ -25,6 +25,11 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +// For version specific disabled tests below (http://crbug.com/230534). +#include "base/win/windows_version.h" +#endif + using base::HistogramBase; using base::HistogramSamples; using base::StatisticsRecorder; @@ -1068,9 +1073,12 @@ TEST_F(SpellcheckCustomDictionaryTest, DictionarySyncLimit) { server_custom_dictionary->GetWords().size()); } -// Failing consistently on Win7. See crbug.com/230534. -// Re-enabling for testing to fix aforementioned bug. TEST_F(SpellcheckCustomDictionaryTest, RecordSizeStatsCorrectly) { +#if defined(OS_WIN) +// Failing consistently on Win7. See crbug.com/230534. + if (base::win::GetVersion() >= base::win::VERSION_VISTA) + return; +#endif // Record a baseline. SpellCheckHostMetrics::RecordCustomWordCountStats(123); diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc index 0d0f29a..37df690 100644 --- a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc @@ -13,6 +13,11 @@ #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_WIN) +// For version specific disabled tests below (http://crbug.com/230534). +#include "base/win/windows_version.h" +#endif + using base::HistogramBase; using base::HistogramSamples; using base::StatisticsRecorder; @@ -66,9 +71,12 @@ TEST_F(SpellcheckHostMetricsTest, RecordEnabledStats) { EXPECT_EQ(1, samples->GetCount(1)); } -// Failing consistently on Win7. See crbug.com/230534. -// Re-enabling for testing to fix aforementioned bug. TEST_F(SpellcheckHostMetricsTest, CustomWordStats) { +#if defined(OS_WIN) +// Failing consistently on Win7. See crbug.com/230534. + if (base::win::GetVersion() >= base::win::VERSION_VISTA) + return; +#endif SpellCheckHostMetrics::RecordCustomWordCountStats(123); // Determine if test failures are due the statistics recorder not being |