Split user agent code out of the 'glue' target

content/browser/android/content_settings.cc

 // Copyright (c) 2012 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 "content/browser/android/content_settings.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ContentSettings_jni.h"
-#include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/user_agent/user_agent.h"
+#include "webkit/user_agent/user_agent_util.h"
 
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::GetFieldID;
 using base::android::GetMethodIDFromClassName;
 using base::android::ScopedJavaLocalRef;
 using webkit_glue::WebPreferences;
@@ skipping 309 matching lines @@
   return reinterpret_cast<jint>(content_settings);
 }
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   // "Version/4.0" had been hardcoded in the legacy WebView.
   std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0");
   return base::android::ConvertUTF8ToJavaString(env, ua).Release();
 }
 
 }  // namespace content