Move the |ElevatedDaemonController| implementation to |DaemonControllerDelegateWin|

remoting/host/setup/daemon_controller_delegate_win.h

Index: remoting/host/setup/daemon_controller_delegate_win.h
diff --git a/remoting/host/setup/daemon_controller_delegate_win.h b/remoting/host/setup/daemon_controller_delegate_win.h
index 29ad739fb96c6f2f63de1e2bb8a1f8e65de53287..5862ea73ea5c87f18245945ee5ee8e675de8f2df 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.h
+++ b/remoting/host/setup/daemon_controller_delegate_win.h
@@ -5,13 +5,13 @@
 #ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_WIN_H_
 #define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_WIN_H_
 
-#include "base/memory/scoped_ptr.h"
-#include "base/timer/timer.h"
 #include "base/win/scoped_comptr.h"

[Sergey Ulanov, 2015/01/31 01:06:58]

This can be removed.

-// chromoting_lib.h contains MIDL-generated declarations.
-#include "remoting/host/chromoting_lib.h"
 #include "remoting/host/setup/daemon_controller.h"
 
+namespace base {
+class FilePath;

[Sergey Ulanov, 2015/01/31 01:06:58]

Don't need this.

+}  // namespace base
+
 namespace remoting {
 
 class DaemonInstallerWin;
@@ -37,31 +37,14 @@ class DaemonControllerDelegateWin : public DaemonController::Delegate {
   virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
 
  private:
-  // Activates an unprivileged instance of the daemon controller and caches it.
-  HRESULT ActivateController();
-
-  // Activates an instance of the daemon controller and caches it. If COM
-  // Elevation is supported (Vista+) the activated instance is elevated,
-  // otherwise it is activated under credentials of the caller.
-  HRESULT ActivateElevatedController();
-
-  // Releases the cached instance of the controller.
-  void ReleaseController();
-
-  // |control_| and |control2_| hold references to an instance of the daemon
-  // controller to prevent a UAC prompt on every operation.
-  base::win::ScopedComPtr<IDaemonControl> control_;
-  base::win::ScopedComPtr<IDaemonControl2> control2_;
-
-  // True if |control_| holds a reference to an elevated instance of the daemon
-  // controller.
-  bool control_is_elevated_;
-
-  // This timer is used to release |control_| after a timeout.
-  scoped_ptr<base::OneShotTimer<DaemonControllerDelegateWin> > release_timer_;
-
-  // Handle of the plugin window.
-  HWND window_handle_;
+  HRESULT DoGetConfig(BSTR* config_out);

[Sergey Ulanov, 2015/01/31 01:06:58]

These don't need to be methods in this class. Make them static functions same as
in elevated_controller.cc?

+  HRESULT DoGetVersion(BSTR* version_out);
+  HRESULT SetConfig(BSTR config);
+  HRESULT StartDaemon();
+  HRESULT StopDaemon();
+  HRESULT DoUpdateConfig(BSTR config);
+  HRESULT DoGetUsageStatsConsent(BOOL* allowed, BOOL* set_by_policy);
+  HRESULT SetUsageStatsConsent(BOOL allowed);
 
   DISALLOW_COPY_AND_ASSIGN(DaemonControllerDelegateWin);
 };