Set user-visible machine names and devices types for synced sessions.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 0ec5e3bb809cf93a1036ab991d829d41e0e176b4..a9333c9f383e7039cab19797d019a3e045e981e2 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -118,8 +118,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX)
 #include "base/linux_util.h"
+#endif
+#if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
@@ -277,7 +279,7 @@ void AddFirstRunNewTabs(BrowserInit* browser_init,
   }
 }
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX)
 class GetLinuxDistroTask : public Task {
  public:
   explicit GetLinuxDistroTask() {}
@@ -288,7 +290,7 @@ class GetLinuxDistroTask : public Task {
 
   DISALLOW_COPY_AND_ASSIGN(GetLinuxDistroTask);
 };
-#endif  // USE_LINUX_BREAKPAD
+#endif  // OS_LINUX
 
 void InitializeNetworkOptions(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kEnableFileCookies)) {
@@ -1421,12 +1423,14 @@ int BrowserMain(const MainFunctionParams& parameters) {
   PrefService* local_state = InitializeLocalState(parsed_command_line,
                                                   is_first_run);
 
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX)
   // Needs to be called after we have chrome::DIR_USER_DATA and
   // g_browser_process.
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,

[sky, 2011/08/31 03:35:16]

Why do we need the linux distro if we're not going to use it?

[Yaron, 2011/08/31 23:23:22]

Ya, I was too cavalier about it. Done in the sync code now.

       new GetLinuxDistroTask());
+#endif
 
+#if defined(USE_LINUX_BREAKPAD)
   if (IsCrashReportingEnabled(local_state))
     InitCrashReporter();
 #endif
@@ -2190,4 +2194,3 @@ void RecordPreReadExperimentTime(const char* name, base::TimeDelta time) {
   }
 #endif
 }
-