Set the user agent for 0.6

blimp/client/core/settings/user_agent.cc

Index: blimp/client/core/settings/user_agent.cc
diff --git a/blimp/client/app/user_agent.cc b/blimp/client/core/settings/user_agent.cc
similarity index 93%
rename from blimp/client/app/user_agent.cc
rename to blimp/client/core/settings/user_agent.cc
index 84c223c4b65f1afec5f9498fec3f6a253c0a9df1..bf0c9f562e53cc95832f8817db411ec41b70724c 100644
--- a/blimp/client/app/user_agent.cc
+++ b/blimp/client/core/settings/user_agent.cc
@@ -2,12 +2,17 @@
 // 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 :
@@ -83,4 +88,5 @@ std::string GetOSVersionInfoForUserAgent() {
   return os_cpu;
 }
 
+}  // namespace client
 }  // namespace blimp