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/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";
 const wchar_t kOmahaUsagestatsValue[] = L"usagestats";
 
+// The Omaha Appid of the host. It should be kept in sync with $(var.OmahaAppid)
+// defined in remoting/host/installer/chromoting.wxs and the Omaha server
+// configuration.
+const wchar_t kHostOmahaAppid[] = L"{b210701e-ffc4-49e3-932b-370728c72662}";

[alexeypa (please no reviews), 2012/09/14 15:45:26]

nit: Strictly speaking it does not belong here. branding.cc is a better, though
far from perfect, place.

[Sergey Ulanov, 2012/09/14 17:35:02]

Yes, it was a mistake to put it here. I added new remoting/host/win/omaha.h
header and put it there. It's also used in the plugin, so it has to be in a
shared header.

+
 LONG ReadUsageStatsValue(const wchar_t* state_key, DWORD* usagestats_out) {
   // presubmit: allow wstring
   std::wstring client_state = StringPrintf(kOmahaClientStateKeyFormat,
                                            state_key,
-                                           remoting::kHostOmahaAppid);
+                                           kHostOmahaAppid);
   base::win::RegKey key;
   LONG result = key.Open(HKEY_LOCAL_MACHINE, client_state.c_str(), KEY_READ);
   if (result != ERROR_SUCCESS) {
     return result;
   }
 
   return key.ReadValueDW(kOmahaUsagestatsValue, usagestats_out);
 }
 
 }  // namespace
@@ skipping 44 matching lines @@
       return true;
     }
   }
 
   LOG_GETLASTERROR(ERROR)
       << "Failed to record the user's consent to crash dump reporting";
   return false;
 }
 
 }  // namespace remoting