Remove ephy-uri-tester-shared.{h,c}

The only definitions being used were the definitions for the ad blocking
rule set URLs, which are moved to ephy-filters-manager.h

8 files changed, 5 insertions, 76 deletions

diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 01344a737..3667d3f66 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -41,7 +41,6 @@
 #include "ephy-snapshot-service.h"
 #include "ephy-tabs-catalog.h"
 #include "ephy-uri-helpers.h"
-#include "ephy-uri-tester-shared.h"
 #include "ephy-view-source-handler.h"
 #include "ephy-web-app-utils.h"
 #include "ephy-web-process-extension-proxy.h"
diff --git a/embed/ephy-filters-manager.c b/embed/ephy-filters-manager.c
index 5fa0854bc..277a6b10d 100644
--- a/embed/ephy-filters-manager.c
+++ b/embed/ephy-filters-manager.c
@@ -24,7 +24,6 @@
 #include "ephy-download.h"
 #include "ephy-prefs.h"
 #include "ephy-settings.h"
-#include "ephy-uri-tester-shared.h"
 
 #include <gio/gio.h>
 
diff --git a/embed/ephy-filters-manager.h b/embed/ephy-filters-manager.h
index 38fb53c5e..bd444f08d 100644
--- a/embed/ephy-filters-manager.h
+++ b/embed/ephy-filters-manager.h
@@ -24,6 +24,9 @@
 
 G_BEGIN_DECLS
 
+#define ADBLOCK_DEFAULT_FILTER_URL "https://easylist.to/easylist/easylist.txt"
+#define ADBLOCK_PRIVACY_FILTER_URL "https://easylist.to/easylist/easyprivacy.txt"
+
 #define EPHY_TYPE_FILTERS_MANAGER (ephy_filters_manager_get_type ())
 
 G_DECLARE_FINAL_TYPE (EphyFiltersManager, ephy_filters_manager, EPHY, FILTERS_MANAGER, GObject)
diff --git a/lib/ephy-uri-tester-shared.c b/lib/ephy-uri-tester-shared.c
deleted file mode 100644
index 323b36001..000000000
--- a/lib/ephy-uri-tester-shared.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- *  Copyright © 2016 Igalia S.L.
- *
- *  This file is part of Epiphany.
- *
- *  Epiphany is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Epiphany is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Epiphany.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include "ephy-uri-tester-shared.h"
-
-GFile *
-ephy_uri_tester_get_adblock_filter_file (const char *adblock_data_dir,
-                                         const char *filter_url)
-{
-  char *filter_filename, *filter_path;
-  GFile *filter_file;
-
-  filter_filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, filter_url, -1);
-  filter_path = g_build_filename (adblock_data_dir, filter_filename, NULL);
-  g_free (filter_filename);
-  filter_file = g_file_new_for_path (filter_path);
-  g_free (filter_path);
-
-  return filter_file;
-}
diff --git a/lib/ephy-uri-tester-shared.h b/lib/ephy-uri-tester-shared.h
deleted file mode 100644
index 038417d5a..000000000
--- a/lib/ephy-uri-tester-shared.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- *  Copyright © 2016 Igalia S.L.
- *
- *  This file is part of Epiphany.
- *
- *  Epiphany is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Epiphany is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Epiphany.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define ADBLOCK_DEFAULT_FILTER_URL "https://easylist.to/easylist/easylist.txt"
-#define ADBLOCK_PRIVACY_FILTER_URL "https://easylist.to/easylist/easyprivacy.txt"
-
-GFile *ephy_uri_tester_get_adblock_filter_file (const char *adblock_data_dir,
-                                                const char *filter_url);
-
-G_END_DECLS
diff --git a/lib/meson.build b/lib/meson.build
index 6a4eeb589..2060d7d4e 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -39,7 +39,6 @@ libephymisc_sources = [
   'ephy-sync-utils.c',
   'ephy-time-helpers.c',
   'ephy-uri-helpers.c',
-  'ephy-uri-tester-shared.c',
   'ephy-user-agent.c',
   'ephy-web-app-utils.c',
   'ephy-zoom.c',
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 4a9dc9fe0..ee9d3259f 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -30,6 +30,7 @@
 #include "ephy-embed-utils.h"
 #include "ephy-file-chooser.h"
 #include "ephy-file-helpers.h"
+#include "ephy-filters-manager.h"
 #include "ephy-flatpak-utils.h"
 #include "ephy-gui.h"
 #include "ephy-langs.h"
@@ -43,7 +44,6 @@
 #include "ephy-sync-service.h"
 #include "ephy-sync-utils.h"
 #include "ephy-time-helpers.h"
-#include "ephy-uri-tester-shared.h"
 #include "ephy-web-app-utils.h"
 #include "clear-data-dialog.h"
 #include "cookies-dialog.h"
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c
index d88159719..744a1b487 100644
--- a/src/profile-migrator/ephy-profile-migrator.c
+++ b/src/profile-migrator/ephy-profile-migrator.c
@@ -23,6 +23,7 @@
 #include "ephy-bookmarks-manager.h"
 #include "ephy-debug.h"
 #include "ephy-file-helpers.h"
+#include "ephy-filters-manager.h"
 #include "ephy-history-service.h"
 #include "ephy-password-manager.h"
 #include "ephy-prefs.h"
@@ -33,7 +34,6 @@
 #include "ephy-string.h"
 #include "ephy-sync-debug.h"
 #include "ephy-sync-utils.h"
-#include "ephy-uri-tester-shared.h"
 #include "ephy-web-app-utils.h"
 #include "gvdb-builder.h"
 #include "gvdb-reader.h"