ephy-profile-migration: separate migration code into another binary

The migration code is now in the ephy-profile-migrator binary, this means:
 - epiphany is not linking to NSS anymore
 - lib/ephy-profile-migration.c was split into:
  + lib/ephy-profile-migrator.c: the new ephy-profile-migrator binary
  + lib/ephy-profile-utils.c: convenience _ephy_profile_*_form_auth_data functions.
 - testing for migration is done without running ephy-profile-migrator

Bug #636685

2 files changed, 19 insertions, 19 deletions

diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 9e6b4b316..9ca1d328e 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -32,7 +32,7 @@
 #include "ephy-marshal.h"
 #include "ephy-signal-accumulator.h"
 #include "ephy-permission-manager.h"
-#include "ephy-profile-migration.h"
+#include "ephy-profile-utils.h"
 #include "ephy-prefs.h"
 #include "ephy-settings.h"
 
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 9b0d2f799..37fc1f97f 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -41,7 +41,7 @@
 #include "ephy-prefs.h"
 #include "ephy-marshal.h"
 #include "ephy-permission-manager.h"
-#include "ephy-profile-migration.h"
+#include "ephy-profile-utils.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-history.h"
 #include "ephy-settings.h"
@@ -706,11 +706,11 @@ store_password (GtkInfoBar *info_bar, gint response_id, gpointer data)
   }
 
   LOG ("Response is GTK_RESPONSE_YES - saving!");
-  _ephy_profile_store_form_auth_data (uri,
-                                      name_field_name,
-                                      password_field_name,
-                                      name_field_value,
-                                      password_field_value);
+  _ephy_profile_utils_store_form_auth_data (uri,
+                                            name_field_name,
+                                            password_field_name,
+                                            name_field_value,
+                                            password_field_value);
 
   /* Update internal caching */
   soup_uri = soup_uri_new (uri);
@@ -865,12 +865,12 @@ form_submitted_cb (WebKitDOMHTMLFormElement *dom_form,
        store_data->name_value,
        store_data->password_value);
 
-  _ephy_profile_query_form_auth_data (store_data->uri,
-                                      store_data->name_field,
-                                      store_data->password_field,
-                                      should_store_cb,
-                                      store_data,
-                                      NULL);
+  _ephy_profile_utils_query_form_auth_data (store_data->uri,
+                                            store_data->name_field,
+                                            store_data->password_field,
+                                            should_store_cb,
+                                            store_data,
+                                            NULL);
 
   soup_uri_free (uri);
 
@@ -911,12 +911,12 @@ pre_fill_form (WebKitDOMNode *username_node,
       fill_data->username_node = g_object_ref (username_node);
       fill_data->password_node = g_object_ref (password_node);
 
-      _ephy_profile_query_form_auth_data (uri_str,
-                                          data->form_username,
-                                          data->form_password,
-                                          fill_form_cb,
-                                          fill_data,
-                                          fill_data_free);
+      _ephy_profile_utils_query_form_auth_data (uri_str,
+                                                data->form_username,
+                                                data->form_password,
+                                                fill_form_cb,
+                                                fill_data,
+                                                fill_data_free);
       g_free (uri_str);
     }
     g_free (username_field_name);