Merge 8764 - Add support for UA spoofing, and spoof Safari's UA string when l...

net/url_request/url_request_inet_job.cc

 // Copyright (c) 2006-2008 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 "net/url_request/url_request_inet_job.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 71 matching lines @@
 URLRequestInetJob::URLRequestInetJob(URLRequest* request)
     : URLRequestJob(request),
       connection_handle_(NULL),
       request_handle_(NULL),
       last_error_(ERROR_SUCCESS),
       is_waiting_(false),
       read_in_progress_(false) {
   // TODO(darin): we should re-create the internet if the UA string changes,
   // but we have to be careful about existing users of this internet.
   if (!the_internet_) {
-    InitializeTheInternet(
-        request->context() ? request->context()->user_agent() : std::string());
+    InitializeTheInternet(request->context() ?
+        request->context()->GetUserAgent(GURL()) : std::string());
   }
 #ifndef NDEBUG
   DCHECK(MessageLoop::current() == my_message_loop_) <<
       "All URLRequests should happen on the same thread";
 #endif
 }
 
 URLRequestInetJob::~URLRequestInetJob() {
   DCHECK(!request_) << "request should be detached at this point";
 
@@ skipping 323 matching lines @@
       // TODO(darin): This is probably a security problem.  Do something better.
       ResumeSuspendedDownload(handle, 0);
       break;
   }
 
   if (message)
     PostMessage(URLRequestInetJob::message_hwnd_, message,
                 static_cast<WPARAM>(job_id), message_param);
 }