Break circular dependency between InitializeDeviceDisablingManager and DeviceDisabledScreen

chrome/browser/chromeos/system/device_disabling_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 70 matching lines @@
 
   // |delegate| must outlive |this|.
   DeviceDisablingManager(Delegate* delegate,
                          CrosSettings* cros_settings,
                          user_manager::UserManager* user_manager);
   ~DeviceDisablingManager();
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
+  void Init();

[emaxx, 2017/04/13 13:57:31]

nit: Please add a comment like "Must be called after construction".

[emaxx, 2017/04/13 13:57:31]

nit: Move this method upper, right between constructors/destructors and the
following members. This would help to notice it.

[Ivan Šandrk, 2017/04/13 14:22:25]

Should I maybe create a factory method or something like
CreateDeviceDisablingManager, have that one construct the object and call Init()
on it, and then make the constructor and Init() private?

[emaxx, 2017/04/13 14:30:01]

But how will the bug resolved then? If you do all the initialization inside the
factory, then something will read nullptr from BrowserProcessPlatformPart during
the initialization.

[Ivan Šandrk, 2017/04/13 14:44:09]

Done.

[Ivan Šandrk, 2017/04/13 14:44:09]

Done.

[Ivan Šandrk, 2017/04/13 14:44:09]

Haha good point, forgot about that. Was too focused on one part of code xD

+
   // Returns the cached domain that owns the device. The domain is only
   // guaranteed to be up to date if the disabled screen was triggered.
   const std::string& enrollment_domain() const { return enrollment_domain_; }
 
   // Returns the cached disabled message. The message is only guaranteed to be
   // up to date if the disabled screen was triggered.
   const std::string& disabled_message() const { return disabled_message_; }
 
   // Performs a check whether the device is disabled during OOBE. |callback|
   // will be invoked with the result of the check.
   void CheckWhetherDeviceDisabledDuringOOBE(
       const DeviceDisabledCheckCallback& callback);
 
   // Whenever trusted cros settings indicate that the device is disabled, this
   // method should be used to check whether the device disabling is to be
   // honored. If this method returns false, the device should not be disabled.
   static bool HonorDeviceDisablingDuringNormalOperation();
 
  private:
-  void Init();
-
   // Cache the disabled message and inform observers if it changed.
   void CacheDisabledMessageAndNotify(const std::string& disabled_message);
 
   void UpdateFromCrosSettings();
 
   Delegate* delegate_;
   policy::BrowserPolicyConnectorChromeOS* browser_policy_connector_;
   CrosSettings* cros_settings_;
   user_manager::UserManager* user_manager_;
 
@@ skipping 16 matching lines @@
 
   base::WeakPtrFactory<DeviceDisablingManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManager);
 };
 
 }  // namespace system
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_