Revert of Minor cleanup of EnrollmentHandlerChromeOS.

chrome/browser/chromeos/policy/server_backed_state_keys_broker.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_SERVER_BACKED_STATE_KEYS_BROKER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_SERVER_BACKED_STATE_KEYS_BROKER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace chromeos {
 class SessionManagerClient;
 }
 
 namespace policy {
 
-// Brokers server-backed FRE state keys for the device. Retrieves them from
-// session manager via DBus and refreshes them periodically. Consumers can
-// register callbacks to invoke when the state keys change.
+// Brokers server-backed state keys for the device. Retrieves them from session
+// manager via DBus and refreshes them periodically. Consumers can register
+// callbacks to invoke when the state keys change.
 class ServerBackedStateKeysBroker {
  public:
   typedef scoped_ptr<base::CallbackList<void()>::Subscription> Subscription;
   typedef base::Callback<void(const std::vector<std::string>&, bool)>
       StateKeysCallback;
 
   ServerBackedStateKeysBroker(
       chromeos::SessionManagerClient* session_manager_client,
       scoped_refptr<base::TaskRunner> delayed_task_runner);
   ~ServerBackedStateKeysBroker();
@@ skipping 57 matching lines @@
   std::vector<StateKeysCallback> request_callbacks_;
 
   base::WeakPtrFactory<ServerBackedStateKeysBroker> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerBackedStateKeysBroker);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_SERVER_BACKED_STATE_KEYS_BROKER_H_