Revert 66415 - CrOS policies: Store device ID with device token...

chrome/browser/policy/device_token_fetcher.h

 // Copyright (c) 2010 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_POLICY_DEVICE_TOKEN_FETCHER_H_
 #define CHROME_BROWSER_POLICY_DEVICE_TOKEN_FETCHER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 43 matching lines @@
 
   // Returns true if there is a pending token request to the device management
   // server.
   bool IsTokenPending();
 
   // Returns the device management token for this device, blocking until
   // outstanding requests to the device management server are satisfied.  In the
   // case that the token could not be fetched, an empty string is returned.
   std::string GetDeviceToken();
 
-  // Returns the device ID for this device. If no such ID has been set yet, a
-  // new ID is generated and returned.
-  std::string GetDeviceID();
-
   // True if the fetcher has a valid AuthToken for the device management server.
   bool HasAuthToken() const { return !auth_token_.empty(); }
 
   // True if the device token has been fetched and is valid.
   bool IsTokenValid() const;
 
  private:
   friend class DeviceTokenFetcherTest;
 
   // The different states that the fetcher can be in during the process of
@@ skipping 27 matching lines @@
   void MakeReadyToRequestDeviceToken();
 
   // Issues a registration request to the server if both the fetcher is in the
   // ready-to-request state and the device management server AuthToken is
   // available.
   void SendServerRequestIfPossible();
 
   // Saves the device management token to disk once it has been retrieved from
   // the server. Must be called on the FILE thread.
   static void WriteDeviceTokenToDisk(const FilePath& path,
-                                     const std::string& token,
-                                     const std::string& device_id);
+                                     const std::string& token);
 
   // Generates a new device ID used to register the device with the device
   // management server and generate the device token.
   static std::string GenerateNewDeviceID();
 
   FilePath token_path_;
   DeviceManagementBackend* backend_;  // weak
   FetcherState state_;
   std::string device_token_;
-  std::string device_id_;
 
   // Contains the AuthToken for the device management server. Empty if the
   // AuthToken hasn't been issued yet or that was an error getting the
   // AuthToken.
   std::string auth_token_;
 
   // An event that is signaled only once the device token has been fetched
   // or it has been determined that there was an error during fetching.
   base::WaitableEvent device_token_load_complete_event_;
 
   // Registers the fetcher for notification of successful Gaia logins.
   NotificationRegistrar registrar_;
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_TOKEN_FETCHER_H_