This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/settings/device_settings_test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 152 matching lines @@
   void SetUp() override;
   void TearDown() override;
 
   // Flushes any pending device settings operations.
   void FlushDeviceSettings();
 
   // Triggers an owner key and device settings reload on
   // |device_settings_service_| and flushes the resulting load operation.
   void ReloadDeviceSettings();
 
-  void InitOwner(const std::string& user_id, bool tpm_is_ready);
+  void InitOwner(const AccountId& user_id, bool tpm_is_ready);

[achuithb, 2015/10/23 00:08:51]

account_id

[Alexander Alekseev, 2015/10/23 09:11:23]

Done.

 
   content::TestBrowserThreadBundle thread_bundle_;
 
   policy::DevicePolicyBuilder device_policy_;
 
   DeviceSettingsTestHelper device_settings_test_helper_;
   // Note that FakeUserManager is used by ProfileHelper, which some of the
   // tested classes depend on implicitly.
   FakeChromeUserManager* user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
   // Local DeviceSettingsService instance for tests. Avoid using in combination
   // with the global instance (DeviceSettingsService::Get()).
   DeviceSettingsService device_settings_service_;
   scoped_ptr<TestingProfile> profile_;
 
   scoped_ptr<DBusThreadManagerSetter> dbus_setter_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_