Depend on stored sync session GUID for Android.

sync/util/get_session_name.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 "sync/util/get_session_name.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #elif defined(OS_LINUX)
 #include "base/linux_util.h"
 #elif defined(OS_IOS)
 #include "sync/util/get_session_name_ios.h"
 #elif defined(OS_MACOSX)
 #include "sync/util/get_session_name_mac.h"
 #elif defined(OS_WIN)
 #include "sync/util/get_session_name_win.h"
 #elif defined(OS_ANDROID)
-#include "sync/util/session_utils_android.h"
+#include "base/android/build_info.h"
 #endif
 
 namespace syncer {
 
 namespace {
 
 std::string GetSessionNameSynchronously() {
   std::string session_name;
 #if defined(OS_CHROMEOS)
   // TODO(kochi): This is very ad hoc and fragile. http://crbug.com/126732.
@@ skipping 10 matching lines @@
   session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
 #elif defined(OS_LINUX)
   session_name = base::GetLinuxDistro();
 #elif defined(OS_IOS)
   session_name = internal::GetComputerName();
 #elif defined(OS_MACOSX)
   session_name = internal::GetHardwareModelName();
 #elif defined(OS_WIN)
   session_name = internal::GetComputerName();
 #elif defined(OS_ANDROID)
-  session_name = internal::GetModel();
+  base::android::BuildInfo* android_build_info =
+      base::android::BuildInfo::GetInstance();
+  session_name = android_build_info->model();
 #endif
 
   if (session_name == "Unknown" || session_name.empty())
     session_name = base::SysInfo::OperatingSystemName();
 
   return session_name;
 }
 
 void FillSessionName(std::string* session_name) {
   *session_name = GetSessionNameSynchronously();
@@ skipping 18 matching lines @@
       base::Bind(&OnSessionNameFilled,
                  done_callback,
                  base::Owned(session_name)));
 }
 
 std::string GetSessionNameSynchronouslyForTesting() {
   return GetSessionNameSynchronously();
 }
 
 }  // namespace syncer