Revert 255858 "Simplify the user agent code some more since afte..."

trunk/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

Index: trunk/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc	(revision 255866)
+++ trunk/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc	(working copy)
@@ -16,12 +16,12 @@
 #include "chrome/browser/chromeos/policy/wildcard_login_checker.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/common/chrome_content_client.h"
 #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/system_policy_request_context.h"
 #include "components/policy/core/common/policy_pref_names.h"
+#include "content/public/common/content_client.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
@@ -115,7 +115,9 @@
     // TODO(atwilson): Change this to use a UserPolicyRequestContext once
     // Connect() is called after profile initialization. http://crbug.com/323591
     request_context = new SystemPolicyRequestContext(
-        system_request_context, GetUserAgent());
+        system_request_context,
+        content::GetUserAgent(GURL(
+            device_management_service->GetServerUrl())));
   }
   scoped_ptr<CloudPolicyClient> cloud_policy_client(
       new CloudPolicyClient(std::string(), std::string(),