Revert 156889 - Cleanups in Chromoting Host.

remoting/host/plugin/daemon_installer_win.cc

 // 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.
 
 #include "remoting/host/plugin/daemon_installer_win.h"
 
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_variant.h"
 #include "base/win/windows_version.h"
 #include "google_update/google_update_idl.h"
 #include "remoting/base/dispatch_win.h"
-#include "remoting/host/win/omaha.h"
+#include "remoting/host/constants.h"
 
 using base::win::ScopedBstr;
 using base::win::ScopedComPtr;
 using base::win::ScopedVariant;
 
 namespace {
 
 // ProgID of the per-machine Omaha COM server.
 const wchar_t kGoogleUpdate[] = L"GoogleUpdate.Update3WebMachine";
 
@@ skipping 363 matching lines @@
     HWND parent = GetAncestor(window, GA_PARENT);
     if (parent == NULL) {
       return window;
     }
 
     window = parent;
   }
 }
 
 }  // namespace remoting