Revert 156889 - Cleanups in Chromoting Host.

remoting/host/usage_stats_consent_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/usage_stats_consent.h"
 
 #include <windows.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/win/registry.h"
-#include "remoting/host/win/omaha.h"
+#include "remoting/host/constants.h"
 
 namespace {
 
 // The following strings are used to construct the registry key names where
 // we record whether the user has consented to crash dump collection.
 // the user's consent to collect crash dumps is recorded.
 const wchar_t kOmahaClientStateKeyFormat[] =
     L"Software\\Google\\Update\\%ls\\%ls";
 const wchar_t kOmahaClientState[] = L"ClientState";
 const wchar_t kOmahaClientStateMedium[] = L"ClientStateMedium";
@@ skipping 11 matching lines @@
   }
 
   return key.ReadValueDW(kOmahaUsagestatsValue, usagestats_out);
 }
 
 }  // namespace
 
 namespace remoting {
 
 bool GetUsageStatsConsent(bool* allowed, bool* set_by_policy) {
-  // TODO(alexeypa): report whether the consent is set by policy once
+  // TODO(alexeypa): report whether the consent is set by pollicy once
   // supported.
   *set_by_policy = false;
 
   // The user's consent to collect crash dumps is recored as the "usagestats"
   // value in the ClientState or ClientStateMedium key. Probe
   // the ClientStateMedium key first.
   DWORD value = 0;
   if (ReadUsageStatsValue(kOmahaClientStateMedium, &value) == ERROR_SUCCESS) {
     *allowed = value != 0;
     return true;
@@ skipping 29 matching lines @@
       return true;
     }
   }
 
   LOG_GETLASTERROR(ERROR)
       << "Failed to record the user's consent to crash dump reporting";
   return false;
 }
 
 }  // namespace remoting