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

chrome/browser/profile.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 "chrome/browser/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/path_service.h"
@@ skipping 87 matching lines @@
                                     public NotificationObserver {
  public:
   // |cookie_store_path| is the local disk path at which the cookie store
   // is persisted.
   RequestContext(const std::wstring& cookie_store_path,
                  const std::wstring& disk_cache_path,
                  PrefService* prefs)
       : prefs_(prefs) {
     cookie_store_ = NULL;
 
-    // setup user agent
-    user_agent_ = webkit_glue::GetUserAgent();
     // set up Accept-Language and Accept-Charset header values
     // TODO(jungshik) : This may slow down http requests. Perhaps,
     // we have to come up with a better way to set up these values.
     accept_language_ = WideToASCII(prefs_->GetString(prefs::kAcceptLanguages));
     accept_charset_ = WideToASCII(prefs_->GetString(prefs::kDefaultCharset));
     accept_charset_ += ",*,utf-8";
 
     CommandLine command_line;
 
     scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line));
@@ skipping 29 matching lines @@
       default_request_context_ = this;
     NotificationService::current()->Notify(
         NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE,
         NotificationService::AllSources(), NotificationService::NoDetails());
 
     // Register for notifications about prefs.
     prefs_->AddPrefObserver(prefs::kAcceptLanguages, this);
     prefs_->AddPrefObserver(prefs::kCookieBehavior, this);
   }
 
+  const std::string& GetUserAgent(

[darin (slow to review), 2009/01/28 09:15:01]

nit: the line break here should probably be removed.

+        const GURL& url) const {
+    return webkit_glue::GetUserAgent(url);
+  }
+
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     if (NOTIFY_PREF_CHANGED == type) {
       std::wstring* pref_name_in = Details<std::wstring>(details).ptr();
       PrefService* prefs = Source<PrefService>(source).ptr();
       DCHECK(pref_name_in && prefs);
       if (*pref_name_in == prefs::kAcceptLanguages) {
         std::string accept_language =
@@ skipping 75 matching lines @@
     // context to make sure it doesn't go away when we delete the object graph.
     original_context_ = profile->GetRequestContext();
 
     CommandLine command_line;
     scoped_ptr<net::ProxyInfo> proxy_info(CreateProxyInfo(command_line));
 
     http_transaction_factory_ = new net::HttpCache(NULL, 0);
     cookie_store_ = new net::CookieMonster;
     cookie_policy_.SetType(net::CookiePolicy::FromInt(
         prefs_->GetInteger(prefs::kCookieBehavior)));
-    user_agent_ = original_context_->user_agent();
     accept_language_ = original_context_->accept_language();
     accept_charset_ = original_context_->accept_charset();
     is_off_the_record_ = true;
 
     // Register for notifications about prefs.
     prefs_->AddPrefObserver(prefs::kAcceptLanguages, this);
     prefs_->AddPrefObserver(prefs::kCookieBehavior, this);
   }
 
   // Since OffTheRecordProfileImpl maybe be destroyed after destroying
@@ skipping 703 matching lines @@
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   if (!personalization_.get())
     personalization_.reset(
         Personalization::CreateProfilePersonalization(this));
   return personalization_.get();
 }
 #endif