Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(705)

Side by Side Diff: sync/util/get_session_name_mac.mm

Issue 10827126: mac: Don't use |NSHost currentHost|, as it takes 4s per test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/util/get_session_name_mac.h" 5 #include "sync/util/get_session_name_mac.h"
6 6
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
akalin 2012/08/01 23:06:11 are all of these imports/includes still needed?
8 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> 8 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
9 #include <sys/sysctl.h> // sysctlbyname() 9 #include <sys/sysctl.h> // sysctlbyname()
10 10
11 #include "base/mac/foundation_util.h" 11 #include "base/mac/foundation_util.h"
12 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
13 #include "base/memory/scoped_nsobject.h" 13 #include "base/mac/scoped_cftyperef.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/sys_info.h" 15 #include "base/sys_info.h"
16 #include "base/sys_string_conversions.h" 16 #include "base/sys_string_conversions.h"
17 17
18 namespace syncer { 18 namespace syncer {
19 namespace internal { 19 namespace internal {
20 20
21 std::string GetHardwareModelName() { 21 std::string GetHardwareModelName() {
22 NSHost* myHost = [NSHost currentHost]; 22 SCDynamicStoreContext context = { 0, NULL, NULL, NULL };
23 return base::SysNSStringToUTF8([myHost localizedName]); 23 base::mac::ScopedCFTypeRef<SCDynamicStoreRef> store(
24 SCDynamicStoreCreate(kCFAllocatorDefault, CFSTR("policy_subsystem"),
25 NULL, &context));
26 CFStringRef machinename = SCDynamicStoreCopyLocalHostName(store.get());
akalin 2012/08/01 23:06:11 machinename -> machine_name?
27 return base::SysCFStringRefToUTF8(machinename);
24 } 28 }
25 29
26 } // namespace internal 30 } // namespace internal
27 } // namespace syncer 31 } // namespace syncer
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698