Merge arc/common/settings.mojom into intent_helper.mojom

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 1631 matching lines @@
     ],
     # ChromeOS only sources of app_list.
     'chrome_unit_tests_app_list_chromeos_sources': [
       'browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_unittest.cc',
     ],
     # ARC only sources of app_list.
     'chrome_unit_tests_app_list_chromeos_arc_sources': [
       'browser/ui/app_list/arc/arc_app_unittest.cc',
     ],
     'chrome_unit_tests_arc_settings_bridge_sources': [
-      'browser/chromeos/arc/arc_settings_bridge_unittest.cc',
+      'browser/chromeos/arc/settings_bridge_unittest.cc',
     ],
     # Sources for Offline pages. For now only for Android.
     'chrome_unit_tests_offline_pages_sources': [
       'browser/android/offline_pages/offline_page_mhtml_archiver_unittest.cc',
       'browser/android/offline_pages/offline_page_utils_unittest.cc',
       'browser/android/offline_pages/test_offline_page_model_builder.cc',
       'browser/android/offline_pages/test_offline_page_model_builder.h',
     ],
   },
   'targets': [
@@ skipping 1393 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }