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

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

 // Copyright (c) 2012 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 "chrome/browser/chromeos/policy/auto_enrollment_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
-#include "chrome/common/chrome_content_client.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/system_policy_request_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_client.h"
 #include "crypto/sha2.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace em = enterprise_management;
 
 namespace {
 
@@ skipping 59 matching lines @@
     int power_limit)
     : completion_callback_(callback),
       should_auto_enroll_(false),
       device_id_(base::GenerateGUID()),
       power_initial_(power_initial),
       power_limit_(power_limit),
       modulus_updates_received_(0),
       device_management_service_(service),
       local_state_(local_state) {
   request_context_ = new SystemPolicyRequestContext(
-      system_request_context, GetUserAgent());
+      system_request_context,
+      content::GetUserAgent(
+          GURL(device_management_service_->GetServerUrl())));
 
   DCHECK_LE(power_initial_, power_limit_);
   DCHECK(!completion_callback_.is_null());
   if (!serial_number.empty())
     serial_number_hash_ = crypto::SHA256HashString(serial_number);
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 }
 
 AutoEnrollmentClient::~AutoEnrollmentClient() {
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
@@ skipping 273 matching lines @@
   request_job_.reset();
   time_start_ = base::Time();
 
   if (completion_callback_.is_null()) {
     // CancelAndDeleteSoon() was invoked before.
     base::MessageLoopProxy::current()->DeleteSoon(FROM_HERE, this);
   }
 }
 
 }  // namespace policy