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

webkit/tools/test_shell/test_shell_request_context.cc

Index: webkit/tools/test_shell/test_shell_request_context.cc
===================================================================
--- webkit/tools/test_shell/test_shell_request_context.cc	(revision 8772)
+++ webkit/tools/test_shell/test_shell_request_context.cc	(working copy)
@@ -22,8 +22,6 @@
     net::HttpCache::Mode cache_mode) {
   cookie_store_ = new net::CookieMonster();
 
-  user_agent_ = webkit_glue::GetUserAgent();
-
   // hard-code A-L and A-C for test shells
   accept_language_ = "en-us,en";
   accept_charset_ = "iso-8859-1,*,utf-8";
@@ -43,3 +41,7 @@
   delete http_transaction_factory_;
 }
 
+const std::string& TestShellRequestContext::GetUserAgent(
+    const GURL& url) const {
+  return webkit_glue::GetUserAgent(url);
+}