Move website settings fetching from WebsitePreferences to new WebsitePermissionFetcher.

chrome/browser/android/preferences/website_address.cc

Index: chrome/browser/android/preferences/website_address.cc
diff --git a/chrome/browser/android/preferences/website_address.cc b/chrome/browser/android/preferences/website_address.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3078c189c9bfe4d91619b503ff182e9d500c8488
--- /dev/null
+++ b/chrome/browser/android/preferences/website_address.cc
@@ -0,0 +1,27 @@
+// Copyright 2015 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/android/preferences/website_address.h"
+
+#include "base/android/jni_string.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "jni/WebsiteAddress_jni.h"
+#include "url/gurl.h"
+
+jboolean HasSameContentSettingsOrigin(JNIEnv* env,

[Miguel Garcia, 2015/02/18 21:40:46]

Do we really need to go to C++ to do this? can't we just do it in java using the
URI class? By the time you get here all the complexity of the url class is
reduced to checking a (well defined) origin. and we can compare origins in
java...

[Michael van Ouwerkerk, 2015/02/19 17:19:35]

Done.

+                                      jclass clazz,
+                                      jstring url1,
+                                      jstring url2) {
+  // This uses the same origin matching logic as many of the content settings.
+  // TODO(sashab): Remove this and individually fetch origin settings in
+  // WebsitePermissionsFetcher instead of filtering afterwards this way.
+  GURL gurl1 = GURL(base::android::ConvertJavaStringToUTF8(env, url1));
+  GURL gurl2 = GURL(base::android::ConvertJavaStringToUTF8(env, url2));
+  return ContentSettingsPattern::FromURL(gurl1).Matches(gurl2);
+}
+
+// Register native methods
+bool RegisterWebsiteAddress(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}