Credential Manager: Refactor password_manager::CredentialManagerClient.

components/password_manager/content/renderer/credential_manager_client.h

 // Copyright 2014 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 COMPONENTS_PASSWORD_MANAGER_CONTENT_RENDERER_CREDENTIAL_MANAGER_CLIENT_H_
 #define COMPONENTS_PASSWORD_MANAGER_CONTENT_RENDERER_CREDENTIAL_MANAGER_CLIENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
-#include "content/public/renderer/render_process_observer.h"
+#include "content/public/renderer/render_view_observer.h"
 #include "ipc/ipc_listener.h"
 #include "third_party/WebKit/public/platform/WebCredentialManagerClient.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 
 namespace blink {
 class WebCredential;
 class WebURL;
 }
 
 namespace content {
@@ skipping 16 matching lines @@
 // to send messages to the browser process, and to route responses to itself.
 //
 // When the render thread is shut down (or the client is destructed), the
 // routing is removed, the pointer is cleared, and any pending responses are
 // rejected.
 //
 // Note that each RenderView's WebView holds a pointer to the
 // CredentialManagerClient (set in 'OnRenderViewCreated()'). The client is
 // guaranteed to outlive the views that point to it.
 class CredentialManagerClient : public blink::WebCredentialManagerClient,
-                                public content::RenderProcessObserver,
-                                public IPC::Listener {
+                                public content::RenderViewObserver {
  public:
-  CredentialManagerClient();
+  explicit CredentialManagerClient(content::RenderView* render_view);
   virtual ~CredentialManagerClient();
 
-  // When a RenderView is created, we need to set this object as its client.
-  void OnRenderViewCreated(content::RenderView*);
-
-  // content::RenderProcessObserver:
-  virtual void OnRenderProcessShutdown() OVERRIDE;
-
-  // IPC::Listener:
+  // RenderViewObserver:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Message handlers for messages from the browser process:
   virtual void OnAcknowledgeFailedSignIn(int request_id);
   virtual void OnAcknowledgeSignedIn(int request_id);
   virtual void OnAcknowledgeSignedOut(int request_id);
   virtual void OnSendCredential(int request_id,
                                 const CredentialInfo& credential_info);
 
   // blink::WebCredentialManager:
   virtual void dispatchFailedSignIn(
       const blink::WebCredential& credential,
       WebCredentialManagerClient::NotificationCallbacks* callbacks) OVERRIDE;
   virtual void dispatchSignedIn(
       const blink::WebCredential& credential,
       WebCredentialManagerClient::NotificationCallbacks* callbacks) OVERRIDE;
   virtual void dispatchSignedOut(NotificationCallbacks* callbacks) OVERRIDE;
   virtual void dispatchRequest(
       bool zero_click_only,
       const blink::WebVector<blink::WebURL>& federations,
       RequestCallbacks* callbacks) OVERRIDE;
 
- protected:
-  virtual int GetRoutingID();
-
  private:
   typedef IDMap<blink::WebCredentialManagerClient::RequestCallbacks,
                 IDMapOwnPointer> RequestCallbacksMap;
   typedef IDMap<blink::WebCredentialManagerClient::NotificationCallbacks,
                 IDMapOwnPointer> NotificationCallbacksMap;
 
   void RespondToNotificationCallback(int request_id,
                                      NotificationCallbacksMap* map);
 
-  // Nulls out the raw pointer to |render_thread_| after ensuring that any
-  // message routing is removed.
-  void DisconnectFromRenderThread();
-
-  int routing_id_;
-  content::RenderThread* render_thread_;
-
   // Track the various blink::WebCredentialManagerClient::*Callbacks objects
   // generated from Blink. This class takes ownership of these objects.
   NotificationCallbacksMap failed_sign_in_callbacks_;
   NotificationCallbacksMap signed_in_callbacks_;
   NotificationCallbacksMap signed_out_callbacks_;
   RequestCallbacksMap request_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(CredentialManagerClient);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CONTENT_RENDERER_CREDENTIAL_MANAGER_CLIENT_H_