Device info datatype should be moved to components/sync_driver.

chrome/browser/supervised_user/supervised_user_registration_utility.cc

 // 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.
 
 #include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_update.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
-#include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "sync/util/get_session_name.h"
 
 using base::DictionaryValue;
 
 namespace {
 
 SupervisedUserRegistrationUtility* g_instance_for_tests = NULL;
 
 // Actual implementation of SupervisedUserRegistrationUtility.
 class SupervisedUserRegistrationUtilityImpl
     : public SupervisedUserRegistrationUtility,
@@ skipping 254 matching lines @@
         supervised_user_shared_settings_service_,
         pending_supervised_user_id_,
         supervised_users::kChromeOSPasswordData,
         scoped_ptr<base::Value>(info.password_data.DeepCopy()),
         base::Bind(
             &SupervisedUserRegistrationUtilityImpl::
                 OnPasswordChangeAcknowledged,
             weak_ptr_factory_.GetWeakPtr())));
   }
 
-  browser_sync::DeviceInfo::GetClientName(
+  syncer::GetSessionName(
+      content::BrowserThread::GetBlockingPool(),
       base::Bind(&SupervisedUserRegistrationUtilityImpl::FetchToken,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void SupervisedUserRegistrationUtilityImpl::CancelPendingRegistration() {
   AbortPendingRegistration(
       false,  // Don't run the callback. The error will be ignored.
       GoogleServiceAuthError(GoogleServiceAuthError::NONE));
 }
 
@@ skipping 88 matching lines @@
           pending_supervised_user_id_);
     }
   }
 
   if (run_callback)
     callback_.Run(error, pending_supervised_user_token_);
   callback_.Reset();
 }
 
 } // namespace