[Sync] Persist keystore key across restarts

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"
@@ skipping 25 matching lines @@
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
   if (!provider->GetMachineStatistic(kMachineInfoBoard, &board))
     LOG(ERROR) << "Failed to get board information";
   // Currently, only "stumpy" type of board is considered Chromebox, and
   // anything else is Chromebook.
   session_name = (board == "stumpy") ? "Chromebox" : "Chromebook";
 #elif defined(OS_LINUX)
   session_name = base::GetLinuxDistro();
 #elif defined(OS_MACOSX)
-//  session_name = internal::GetHardwareModelName();
+  session_name = internal::GetHardwareModelName();
 #elif defined(OS_WIN)
   session_name = internal::GetComputerName();
 #elif defined(OS_ANDROID)
   session_name = internal::GetModel();
 #endif
 
   if (session_name == "Unknown" || session_name.empty())
     session_name = base::SysInfo::OperatingSystemName();
 
   return session_name;
@@ skipping 22 matching lines @@
       base::Bind(&OnSessionNameFilled,
                  done_callback,
                  base::Owned(session_name)));
 }
 
 std::string GetSessionNameSynchronouslyForTesting() {
   return GetSessionNameSynchronously();
 }
 
 }  // namespace syncer