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

trunk/src/android_webview/native/aw_settings.cc

Index: trunk/src/android_webview/native/aw_settings.cc
===================================================================
--- trunk/src/android_webview/native/aw_settings.cc	(revision 255866)
+++ trunk/src/android_webview/native/aw_settings.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
-#include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ -15,8 +14,10 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "jni/AwSettings_jni.h"
+#include "webkit/common/user_agent/user_agent.h"
 #include "webkit/common/webpreferences.h"
 
 using base::android::ConvertJavaStringToUTF16;
@@ -340,7 +341,8 @@
 }
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
-  return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
+  return base::android::ConvertUTF8ToJavaString(
+      env, content::GetUserAgent(GURL())).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {