Revert of Non-plafrom-specific part of an OwnerSettingsService is mov…

…ed to components/ownership/*. (patchset chromium#4 id:60001 of https://codereview.chromium.org/548323003/)

Reason for revert:
Breaks compile on multiple bots:

http://build.chromium.org/p/chromium.win/builders/Win%20Builder%20%28dbg%29/builds/3134
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder%20%28dbg%29/builds/73424
http://build.chromium.org/p/chromium.webkit/builders/GPU%20Win%20Builder%20%28dbg%29/builds/13365

Original issue's description:
> Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.
>
> BUG=398856
> TEST=existing browser_tests and unit_tests
> R=erg@chromium.org, jochen@chromium.org, nkostylev@chromium.org, pastarmovj@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/46a58bffbe303d3484d7cc288b47bfae5388109c

TBR=jochen@chromium.org,erg@chromium.org,nkostylev@chromium.org,pastarmovj@chromium.org,ygorshenin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=398856

Review URL: https://codereview.chromium.org/565293003

Cr-Commit-Position: refs/heads/master@{#294618}

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

@@ -22,7 +22,7 @@
 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -59,7 +59,7 @@ void OnRemoveAppCryptohomeComplete(const std::string& app,
 // Check for presence of machine owner public key file.
 void CheckOwnerFilePresence(bool *present) {
   scoped_refptr<ownership::OwnerKeyUtil> util =
-      OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil();
+      OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil();
   *present = util.get() && util->IsPublicKeyPresent();
 }
 

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -55,7 +55,7 @@
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
 #include "chrome/browser/chromeos/options/cert_library.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
@@ -187,7 +187,7 @@ class DBusServices {
     DeviceSettingsService::Initialize();
     DeviceSettingsService::Get()->SetSessionManager(
         DBusThreadManager::Get()->GetSessionManagerClient(),
-        OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil());
+        OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil());
   }
 
   ~DBusServices() {

chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

@@ -5,11 +5,10 @@
 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
 
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/login/login_state.h"
-#include "components/ownership/owner_key_util.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -45,9 +44,9 @@ void ChromeCryptohomeAuthenticator::CheckSafeModeOwnership(
                                         LoginState::LOGGED_IN_USER_NONE);
   }
 
-  OwnerSettingsServiceChromeOS::IsOwnerForSafeModeAsync(
+  OwnerSettingsService::IsOwnerForSafeModeAsync(
       context.GetUserIDHash(),
-      OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil(),
+      OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(),
       callback);
 }
 

chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

@@ -18,8 +18,8 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
@@ -136,8 +136,8 @@ class CryptohomeAuthenticatorTest : public testing::Test {
         mock_caller_(NULL),
         mock_homedir_methods_(NULL),
         owner_key_util_(new ownership::MockOwnerKeyUtil()) {
-    OwnerSettingsServiceChromeOSFactory::GetInstance()
-        ->SetOwnerKeyUtilForTesting(owner_key_util_);
+    OwnerSettingsServiceFactory::GetInstance()->SetOwnerKeyUtilForTesting(
+        owner_key_util_);
     user_context_.SetKey(Key("fakepass"));
     user_context_.SetUserIDHash("me_nowhere_com_hash");
     const user_manager::User* user =