Save the client base JID for authentication in case it differs from the email (for accounts non-Goo…

remoting/host/mac/me2me_preference_pane.mm

Index: remoting/host/mac/me2me_preference_pane.mm
diff --git a/remoting/host/mac/me2me_preference_pane.mm b/remoting/host/mac/me2me_preference_pane.mm
index 56cc235e847ee5920dc79c30f9be82a242e3adef..d07fdb4da6fb0400fe905a0f66e8a8b3f7be514f 100644
--- a/remoting/host/mac/me2me_preference_pane.mm
+++ b/remoting/host/mac/me2me_preference_pane.mm
@@ -468,14 +468,18 @@ std::string JsonHostConfig::GetSerializedData() const {
 
   std::string email;
   if (config_.get()) {
-    bool result = config_->GetString(remoting::kHostOwnerConfigPath, &email);
+    bool result =
+        config_->GetString(remoting::kHostOwnerEmailConfigPath, &email);
     if (!result) {
-      result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
-
-      // The config has already been checked by |IsConfigValid|.
+      result = config_->GetString(remoting::kHostOwnerConfigPath, &email);
       if (!result) {
-        [self showError];
-        return;
+        result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
+
+        // The config has already been checked by |IsConfigValid|.
+        if (!result) {
+          [self showError];
+          return;
+        }
       }
     }
   }