Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

chrome/chrome_browser_chromeos.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_chromeos',
       'type': 'static_library',
@@ skipping 764 matching lines @@
         'browser/chromeos/options/network_property_ui_data.cc',
         'browser/chromeos/options/network_property_ui_data.h',
         'browser/chromeos/options/passphrase_textfield.cc',
         'browser/chromeos/options/passphrase_textfield.h',
         'browser/chromeos/options/vpn_config_view.cc',
         'browser/chromeos/options/vpn_config_view.h',
         'browser/chromeos/options/wifi_config_view.cc',
         'browser/chromeos/options/wifi_config_view.h',
         'browser/chromeos/options/wimax_config_view.cc',
         'browser/chromeos/options/wimax_config_view.h',
-        'browser/chromeos/ownership/owner_settings_service_chromeos.cc',
-        'browser/chromeos/ownership/owner_settings_service_chromeos.h',
-        'browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc',
-        'browser/chromeos/ownership/owner_settings_service_chromeos_factory.h',
+        'browser/chromeos/ownership/owner_settings_service.cc',
+        'browser/chromeos/ownership/owner_settings_service.h',
+        'browser/chromeos/ownership/owner_settings_service_factory.cc',
+        'browser/chromeos/ownership/owner_settings_service_factory.h',
         'browser/chromeos/platform_keys/platform_keys.cc',
         'browser/chromeos/platform_keys/platform_keys.h',
         'browser/chromeos/platform_keys/platform_keys_nss.cc',
         'browser/chromeos/platform_keys/platform_keys_service.cc',
         'browser/chromeos/platform_keys/platform_keys_service.h',
         'browser/chromeos/platform_keys/platform_keys_service_factory.cc',
         'browser/chromeos/platform_keys/platform_keys_service_factory.h',
         'browser/chromeos/policy/app_pack_updater.cc',
         'browser/chromeos/policy/app_pack_updater.h',
         'browser/chromeos/policy/auto_enrollment_client.cc',
@@ skipping 406 matching lines @@
         'browser/chromeos/attestation/attestation_signed_data.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/attestation',
         'proto_out_dir': 'chrome/browser/chromeos/attestation',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }