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

trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc

Index: trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc
===================================================================
--- trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc	(revision 255866)
+++ trunk/src/android_webview/browser/net/aw_url_request_context_getter.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "android_webview/browser/net/aw_network_delegate.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/init_native_callback.h"
-#include "android_webview/common/aw_content_client.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ -178,7 +177,7 @@
   DCHECK(!url_request_context_);
 
   net::URLRequestContextBuilder builder;
-  builder.set_user_agent(GetUserAgent());
+  builder.set_user_agent(content::GetUserAgent(GURL()));
   builder.set_network_delegate(new AwNetworkDelegate());
 #if !defined(DISABLE_FTP_SUPPORT)
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.