Cleanup: Get rid of base::ASCIIToWide().

rlz/win/lib/machine_deal.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.
 //
 // Library functions related to the OEM Deal Confirmation Code.
 
 #include "rlz/win/lib/machine_deal.h"
 
 #include <windows.h>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/registry.h"
 #include "rlz/lib/assert.h"
 #include "rlz/lib/lib_values.h"
 #include "rlz/win/lib/lib_mutex.h"
 #include "rlz/win/lib/registry_util.h"
 #include "rlz/win/lib/rlz_value_store_registry.h"
 
+namespace {
+
 const wchar_t kDccValueName[]             = L"DCC";
 
-namespace {
-
 // Current DCC can only uses [a-zA-Z0-9_-!@$*();.<>,:]
 // We will be more liberal and allow some additional chars, but not url meta
 // chars.
 bool IsGoodDccChar(char ch) {
   if (IsAsciiAlpha(ch) || IsAsciiDigit(ch))
     return true;
 
   switch (ch) {
     case '_':
     case '-':
@@ skipping 72 matching lines @@
   base::SplitString(response_line, ':', &tokens);
   if (tokens.size() != 2)
     return false;
 
   // The first token is the key, the second is the value.  The value is already
   // trimmed for whitespace.
   *value = tokens[1];
   return true;
 }
 
-}  // namespace anonymous
+}  // namespace
 
 namespace rlz_lib {
 
 bool MachineDealCode::Set(const char* dcc) {
   LibMutex lock;
   if (lock.failed())
     return false;
 
   // TODO: if (!ProcessInfo::CanWriteMachineKey()) return false;
 
@@ skipping 12 matching lines @@
                   " Did you call rlz_lib::CreateMachineState()?");
     return false;
   }
 
   char normalized_dcc[kMaxDccLength + 1];
   NormalizeDcc(dcc, normalized_dcc);
   VERIFY(length == strlen(normalized_dcc));
 
   // Write the DCC to HKLM.  Note that we need to include the null character
   // when writing the string.
-  if (!RegKeyWriteValue(hklm_key, kDccValueName, normalized_dcc)) {
+  if (!RegKeyWriteValue(&hklm_key, kDccValueName, normalized_dcc)) {
     ASSERT_STRING("MachineDealCode::Set: Could not write the DCC value");
     return false;
   }
 
   return true;
 }
 
 bool MachineDealCode::GetNewCodeFromPingResponse(const char* response,
     bool* has_new_dcc, char* new_dcc, int new_dcc_size) {
   if (!has_new_dcc || !new_dcc || !new_dcc_size)
@@ skipping 127 matching lines @@
   DWORD dcc_size = arraysize(dcc);
   if (dcc_key.ReadValue(kDccValueName, dcc, &dcc_size, NULL) == ERROR_SUCCESS) {
     ASSERT_STRING("MachineDealCode::Clear: Could not delete the DCC value.");
     return false;
   }
 
   return true;
 }
 
 }  // namespace rlz_lib