Refactor native_backend_kwallet_x

chrome/browser/password_manager/native_backend_kwallet_x.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/nix/xdg_util.h"
 #include "base/time/time.h"
+#include "chrome/browser/password_manager/kwallet_dbus.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace autofill {
 struct PasswordForm;
 }
 
 namespace base {
 class Pickle;
 class PickleIterator;
 class WaitableEvent;
 }
 
-namespace dbus {
-class Bus;
-class ObjectProxy;
-}
-
 // NativeBackend implementation using KWallet.
 class NativeBackendKWallet : public PasswordStoreX::NativeBackend {
  public:
   NativeBackendKWallet(LocalProfileId id,
                        base::nix::DesktopEnvironment desktop_env);
 
   ~NativeBackendKWallet() override;
 
   bool Init() override;
 
@@ skipping 41 matching lines @@
   };
 
   enum TimestampToCompare {
     CREATION_TIMESTAMP,
     SYNC_TIMESTAMP,
   };
 
   enum class BlacklistOptions { AUTOFILLABLE, BLACKLISTED };
 
   // Initialization.
-  bool StartKWalletd();
   InitResult InitWallet();
   void InitOnDBThread(scoped_refptr<dbus::Bus> optional_bus,
                       base::WaitableEvent* event,
                       bool* success);
 
   // Overwrites |forms| with all credentials matching |signon_realm|. Returns
   // true on success.
   bool GetLoginsList(const std::string& signon_realm,
                      int wallet_handle,
                      ScopedVector<autofill::PasswordForm>* forms)
@@ skipping 28 matching lines @@
   // Opens the wallet and ensures that the "Chrome Form Data" folder exists.
   // Returns kInvalidWalletHandle on error.
   int WalletHandle();
 
   // Generates a profile-specific folder name based on profile_id_.
   std::string GetProfileSpecificFolderName() const;
 
   // The local profile id, used to generate the folder name.
   const LocalProfileId profile_id_;
 
+  KWalletDBus kwallet_dbus_;
+
   // The KWallet folder name, possibly based on the local profile id.
   std::string folder_name_;
 
-  // DBus handle for communication with klauncher and kwalletd.
-  scoped_refptr<dbus::Bus> session_bus_;
-  // Object proxy for kwalletd. We do not own this.
-  dbus::ObjectProxy* kwallet_proxy_;
-
   // The name of the wallet we've opened. Set during Init().
   std::string wallet_name_;
   // The application name (e.g. "Chromium"), shown in KWallet auth dialogs.
   const std::string app_name_;
 
-  // KWallet DBus name
-  std::string dbus_service_name_;
-  // DBus path to KWallet interfaces
-  std::string dbus_path_;
-  // The name used for logging and by klauncher when starting KWallet
-  std::string kwalletd_name_;
-
   DISALLOW_COPY_AND_ASSIGN(NativeBackendKWallet);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_