Device info datatype should be moved to components/sync_driver.

components/sync_driver/device_info.h

 // 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.
 
-#ifndef CHROME_BROWSER_SYNC_GLUE_DEVICE_INFO_H_
-#define CHROME_BROWSER_SYNC_GLUE_DEVICE_INFO_H_
+#ifndef COMPONENTS_SYNC_DRIVER_DEVICE_INFO_H_
+#define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace base {
 class DictionaryValue;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 // A class that holds information regarding the properties of a device.
 class DeviceInfo {
  public:
-  typedef base::Callback<void(const std::string&)> GetClientNameCallback;
-
   DeviceInfo(const std::string& guid,
              const std::string& client_name,
              const std::string& chrome_version,
              const std::string& sync_user_agent,
              const sync_pb::SyncEnums::DeviceType device_type,
              const std::string& signin_scoped_device_id);
   ~DeviceInfo();
 
   // Sync specific unique identifier for the device. Note if a device
   // is wiped and sync is set up again this id WILL be different.
@@ skipping 34 matching lines @@
   // Apps can set ids for a device that is meaningful to them but
   // not unique enough so the user can be tracked. Exposing |guid|
   // would lead to a stable unique id for a device which can potentially
   // be used for tracking.
   void set_public_id(std::string id);
 
   // Converts the |DeviceInfo| values to a JS friendly DictionaryValue,
   // which extension APIs can expose to third party apps.
   base::DictionaryValue* ToValue();
 
-  // Gets the local device name and passes it as a parameter to callback.
-  static void GetClientName(const GetClientNameCallback& callback);
-
  private:
   const std::string guid_;
 
   const std::string client_name_;
 
   const std::string chrome_version_;
 
   const std::string sync_user_agent_;
 
   const sync_pb::SyncEnums::DeviceType device_type_;
 
   std::string signin_scoped_device_id_;
 
   // Exposing |guid| would lead to a stable unique id for a device which
   // can potentially be used for tracking. Public ids are privacy safe
   // ids in that the same device will have different id for different apps
   // and they are also reset when app/extension is uninstalled.
   std::string public_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfo);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
-#endif  // CHROME_BROWSER_SYNC_GLUE_DEVICE_INFO_H_
+#endif  // COMPONENTS_SYNC_DRIVER_DEVICE_INFO_H_