Cleanup of system settings constants (ab)use.

chrome/browser/chromeos/extensions/echo_private_api.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 "chrome/browser/chromeos/extensions/echo_private_api.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 33 matching lines @@
 void EchoPrivateGetRegistrationCodeFunction::GetRegistrationCode(
     const std::string& type) {
   if (!chromeos::KioskModeSettings::Get()->is_initialized()) {
     chromeos::KioskModeSettings::Get()->Initialize(base::Bind(
         &EchoPrivateGetRegistrationCodeFunction::GetRegistrationCode,
         this, type));
     return;
   }
   // Possible ECHO code type and corresponding key name in StatisticsProvider.
   const std::string kCouponType = "COUPON_CODE";
-  const std::string kCouponCodeKey = "ubind_attribute";
   const std::string kGroupType = "GROUP_CODE";
-  const std::string kGroupCodeKey = "gbind_attribute";
 
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
   std::string result;
   if (!chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     // In Kiosk mode, we effectively disable the registration API
     // by always returning an empty code.
-    if (type == kCouponType)
-      provider->GetMachineStatistic(kCouponCodeKey, &result);
-    else if (type == kGroupType)
-      provider->GetMachineStatistic(kGroupCodeKey, &result);
+    if (type == kCouponType) {
+      provider->GetMachineStatistic(chromeos::system::kOffersCouponCodeKey,
+                                    &result);
+    } else if (type == kGroupType) {
+      provider->GetMachineStatistic(chromeos::system::kOffersGroupCodeKey,
+                                    &result);
+    }
   }
 
   results_ = echo_api::GetRegistrationCode::Results::Create(result);
   SendResponse(true);
 }
 
 bool EchoPrivateGetRegistrationCodeFunction::RunImpl() {
   scoped_ptr<echo_api::GetRegistrationCode::Params> params =
       echo_api::GetRegistrationCode::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params);
@@ skipping 163 matching lines @@
 void EchoPrivateGetUserConsentFunction::Finalize(bool consent) {
   // Consent should not be true if offers redeeming is disabled.
   CHECK(redeem_offers_allowed_ || !consent);
   results_ = echo_api::GetUserConsent::Results::Create(consent);
   SendResponse(true);
 
   // Release the reference added in |OnRedeemOffersAllowedChecked|, before
   // showing the dialog.
   Release();
 }