Revert 159402 - Move DaemonController to remoting/host/setup

DaemonController will be used outside of the plugin, so it doesn't make
sense to keep it in the plugin directory.

Official windows builder got busted.

Review URL: https://chromiumcodereview.appspot.com/10985086

TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11018005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159431 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 13 insertions, 31 deletions

diff --git a/remoting/host/setup/daemon_controller.h b/remoting/host/plugin/daemon_controller.h
index 4fda7c9..bf67345 100644
--- a/remoting/host/setup/daemon_controller.h
+++ b/remoting/host/plugin/daemon_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
-#define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
+#ifndef REMOTING_HOST_DAEMON_CONTROLLER_H_
+#define REMOTING_HOST_DAEMON_CONTROLLER_H_
 
 #include <string>
 
@@ -148,4 +148,4 @@ class DaemonController {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
+#endif  // REMOTING_HOST_DAEMON_CONTROLLER_H_
diff --git a/remoting/host/setup/daemon_controller_linux.cc b/remoting/host/plugin/daemon_controller_linux.cc
index fee859c..ab2e087 100644
--- a/remoting/host/setup/daemon_controller_linux.cc
+++ b/remoting/host/plugin/daemon_controller_linux.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/setup/daemon_controller.h"
+#include "remoting/host/plugin/daemon_controller.h"
 
 #include <unistd.h>
 
diff --git a/remoting/host/setup/daemon_controller_mac.cc b/remoting/host/plugin/daemon_controller_mac.cc
index f82dabd..54c59b3 100644
--- a/remoting/host/setup/daemon_controller_mac.cc
+++ b/remoting/host/plugin/daemon_controller_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/setup/daemon_controller.h"
+#include "remoting/host/plugin/daemon_controller.h"
 
 #include <launch.h>
 #include <stdio.h>
diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/plugin/daemon_controller_win.cc
index 64973ba..2985652 100644
--- a/remoting/host/setup/daemon_controller_win.cc
+++ b/remoting/host/plugin/daemon_controller_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/setup/daemon_controller.h"
+#include "remoting/host/plugin/daemon_controller.h"
 
 #include <objbase.h>
 
diff --git a/remoting/host/plugin/daemon_installer_win.h b/remoting/host/plugin/daemon_installer_win.h
index 3709982..bff134c 100644
--- a/remoting/host/plugin/daemon_installer_win.h
+++ b/remoting/host/plugin/daemon_installer_win.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "remoting/host/plugin/daemon_controller.h"
 
 namespace remoting {
 
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 6af792f..15b5cee 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -27,6 +27,7 @@
 #include "remoting/host/it2me_host_user_interface.h"
 #include "remoting/host/network_settings.h"
 #include "remoting/host/pin_hash.h"
+#include "remoting/host/plugin/daemon_controller.h"
 #include "remoting/host/plugin/host_log_handler.h"
 #include "remoting/host/policy_hack/policy_watcher.h"
 #include "remoting/host/register_support_host_request.h"
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
index c9bd1ec5..db452cf 100644
--- a/remoting/host/plugin/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -23,8 +23,8 @@
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/log_to_server.h"
+#include "remoting/host/plugin/daemon_controller.h"
 #include "remoting/host/plugin/host_plugin_utils.h"
-#include "remoting/host/setup/daemon_controller.h"
 #include "remoting/host/ui_strings.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npfunctions.h"
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index ba03b96..c5c49d9 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1017,29 +1017,6 @@
     },  # end of target 'remoting_host_event_logger'
 
     {
-      'target_name': 'remoting_host_setup_base',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '../base/base.gyp:base',
-        'remoting_host',
-      ],
-      'sources': [
-        'host/setup/daemon_controller.h',
-        'host/setup/daemon_controller_linux.cc',
-        'host/setup/daemon_controller_mac.cc',
-        'host/setup/daemon_controller_win.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            'remoting_elevated_controller',
-          ],
-        }],
-      ],
-    },  # end of target 'remoting_breakpad'
-
-    {
       'target_name': 'remoting_host_plugin',
       'type': 'loadable_module',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -1048,7 +1025,6 @@
       'dependencies': [
         'remoting_base',
         'remoting_host',
-        'remoting_host_setup_base',
         'remoting_host_event_logger',
         'remoting_jingle_glue',
         '../net/net.gyp:net',
@@ -1059,6 +1035,10 @@
         'host/branding.cc',
         'host/branding.h',
         'host/host_ui_resource.h',
+        'host/plugin/daemon_controller.h',
+        'host/plugin/daemon_controller_linux.cc',
+        'host/plugin/daemon_controller_mac.cc',
+        'host/plugin/daemon_controller_win.cc',
         'host/plugin/daemon_installer_win.cc',
         'host/plugin/daemon_installer_win.h',
         'host/plugin/host_log_handler.cc',