Set the user agent for 0.6

blimp/client/core/settings/user_agent.cc

 // Copyright 2016 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 "blimp/client/app/user_agent.h"
+#include "blimp/client/core/settings/user_agent.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+#include <sys/utsname.h>
+#endif
+
 namespace blimp {
+namespace client {
 
 /**
  * Returns a string for building user agent such as :
  * Linux; Android 5.1.1; Nexus 6 Build/LMY49C
  */
 std::string GetOSVersionInfoForUserAgent() {
   std::string os_cpu;
 
 #if defined(OS_ANDROID)
   int32_t os_major_version = 0;
@@ skipping 55 matching lines @@
                       unixinfo.sysname,  // e.g. Linux
                       cputype.c_str()    // e.g. i686
 #endif
                           );  // NOLINT
 
   os_cpu = "Linux; " + os_cpu;
 
   return os_cpu;
 }
 
+}  // namespace client
 }  // namespace blimp