Patch 3.1: Refactored spellcheck_message_filter to be generic

chrome/chrome_tests_unit.gypi

 # Copyright 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 588 matching lines @@
       '../tools/json_schema_compiler/test/objects_unittest.cc',
       '../tools/json_schema_compiler/test/simple_api_unittest.cc',
     ],
     'chrome_unit_tests_spellchecker_sources': [
       'browser/spellchecker/feedback_sender_unittest.cc',
       'browser/spellchecker/feedback_unittest.cc',
       'browser/spellchecker/misspelling_unittest.cc',
       'browser/spellchecker/spellcheck_action_unittest.cc',
       'browser/spellchecker/spellcheck_custom_dictionary_unittest.cc',
       'browser/spellchecker/spellcheck_host_metrics_unittest.cc',
-      'browser/spellchecker/spellcheck_message_filter_mac_unittest.cc',
+      'browser/spellchecker/spellcheck_message_filter_platform_mac_unittest.cc',
       'browser/spellchecker/spellcheck_message_filter_unittest.cc',
       'browser/spellchecker/spellcheck_platform_mac_unittest.cc',
       'browser/spellchecker/spellcheck_service_unittest.cc',
       'browser/spellchecker/spelling_service_client_unittest.cc',
       'browser/spellchecker/word_trimmer_unittest.cc',
       'renderer/spellchecker/custom_dictionary_engine_unittest.cc',
       'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
       'renderer/spellchecker/spellcheck_provider_mac_unittest.cc',
       'renderer/spellchecker/spellcheck_provider_test.cc',
       'renderer/spellchecker/spellcheck_provider_test.h',
@@ skipping 2028 matching lines @@
             'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc',
           ],
         }],
         ['OS != "android" and chromeos == 0', {
           'sources': [ '<@(chrome_unit_tests_non_android_or_chromeos_sources)' ],
         }],
         ['OS=="android"', {
           'dependencies!': [
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
+          'sources!': [
+            'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
+          ],
           'ldflags': [
             # Some android targets still depend on --gc-sections to link.
             # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
             '-Wl,--gc-sections',
           ],
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }, {  # Not Android.
           'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],
@@ skipping 225 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }