[Enhanced Bookmarks] Make enhanced bookmarks default for Android.

components/enhanced_bookmarks.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN: //components/enhanced_bookmarks:enhanced_bookmarks
       'target_name': 'enhanced_bookmarks',
       'type': 'static_library',
@@ skipping 13 matching lines @@
         'keyed_service_core',
         'signin_core_browser',
         'sync_driver',
         'variations',
       ],
       'sources': [
         'enhanced_bookmarks/bookmark_server_cluster_service.cc',
         'enhanced_bookmarks/bookmark_server_cluster_service.h',
         'enhanced_bookmarks/bookmark_server_service.cc',
         'enhanced_bookmarks/bookmark_server_service.h',
-        'enhanced_bookmarks/enhanced_bookmark_features.cc',
-        'enhanced_bookmarks/enhanced_bookmark_features.h',
         'enhanced_bookmarks/enhanced_bookmark_model.cc',
         'enhanced_bookmarks/enhanced_bookmark_model.h',
         'enhanced_bookmarks/enhanced_bookmark_model_observer.h',
-        'enhanced_bookmarks/enhanced_bookmark_switches.cc',
-        'enhanced_bookmarks/enhanced_bookmark_switches.h',
         'enhanced_bookmarks/enhanced_bookmark_utils.cc',
         'enhanced_bookmarks/enhanced_bookmark_utils.h',
         'enhanced_bookmarks/image_record.cc',
         'enhanced_bookmarks/image_record.h',
         'enhanced_bookmarks/image_store.cc',
         'enhanced_bookmarks/image_store.h',
         'enhanced_bookmarks/image_store_util.cc',
         'enhanced_bookmarks/image_store_util.h',
         'enhanced_bookmarks/image_store_util_ios.mm',
         'enhanced_bookmarks/item_position.cc',
         'enhanced_bookmarks/item_position.h',
         'enhanced_bookmarks/metadata_accessor.cc',
         'enhanced_bookmarks/metadata_accessor.h',
         'enhanced_bookmarks/persistent_image_store.cc',
         'enhanced_bookmarks/persistent_image_store.h',
         'enhanced_bookmarks/pref_names.cc',
         'enhanced_bookmarks/pref_names.h',
       ],
       'conditions': [
         ['OS=="ios"', {
+          'sources': [
+            'enhanced_bookmarks/enhanced_bookmark_features.cc',
+            'enhanced_bookmarks/enhanced_bookmark_features.h',
+            'enhanced_bookmarks/enhanced_bookmark_switches.cc',
+            'enhanced_bookmarks/enhanced_bookmark_switches.h',
+          ],
           'sources!': [
             'enhanced_bookmarks/image_store_util.cc',
           ],
         }],
       ],
     },
     {
       # GN: //components/enhanced_bookmarks:enhanced_bookmarks_test_support
       'target_name': 'enhanced_bookmarks_test_support',
       'type': 'static_library',
@@ skipping 35 matching lines @@
           'variables': {
             'source_file': 'enhanced_bookmarks/enhanced_bookmark_utils.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
       ],
      },
    ],
   ],
 }