Replace ProximityAuthUIDelegate with ProximityAuthClient.

components/proximity_auth/webui/proximity_auth_webui_handler.h

 // Copyright 2015 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_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_
 #define COMPONENTS_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "components/proximity_auth/authenticator.h"
 #include "components/proximity_auth/client_observer.h"
 #include "components/proximity_auth/connection_observer.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client.h"
 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_gcm_manager.h"
 #include "components/proximity_auth/logging/log_buffer.h"
-#include "components/proximity_auth/webui/proximity_auth_ui_delegate.h"
+#include "components/proximity_auth/proximity_auth_client.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace cryptauth {
 class ExternalDeviceInfo;
 }
 
@@ skipping 11 matching lines @@
 class SecureContext;
 
 // Handles messages from the chrome://proximity-auth page.
 class ProximityAuthWebUIHandler : public content::WebUIMessageHandler,
                                   public LogBuffer::Observer,
                                   public CryptAuthEnrollmentManager::Observer,
                                   public CryptAuthDeviceManager::Observer,
                                   public ConnectionObserver,
                                   public ClientObserver {
  public:
-  // |delegate| is not owned and must outlive this instance.
-  explicit ProximityAuthWebUIHandler(ProximityAuthUIDelegate* delegate);
+  // |client_| is not owned and must outlive this instance.
+  explicit ProximityAuthWebUIHandler(
+      ProximityAuthClient* proximity_auth_client);
   ~ProximityAuthWebUIHandler() override;
 
   // content::WebUIMessageHandler:
   void RegisterMessages() override;
 
  private:
   // LogBuffer::Observer:
   void OnLogMessageAdded(const LogBuffer::LogMessage& log_message) override;
   void OnLogBufferCleared() override;
 
@@ skipping 84 matching lines @@
   // Returns the current enrollment state that can be used as a JSON object.
   scoped_ptr<base::DictionaryValue> GetEnrollmentStateDictionary();
 
   // Returns the current device sync state that can be used as a JSON object.
   scoped_ptr<base::DictionaryValue> GetDeviceSyncStateDictionary();
 
   // Returns the current unlock keys that can be used as a JSON object.
   scoped_ptr<base::ListValue> GetUnlockKeysList();
 
   // The delegate used to fetch dependencies. Must outlive this instance.
-  ProximityAuthUIDelegate* delegate_;
+  ProximityAuthClient* proximity_auth_client_;
 
   // Creates CryptAuth client instances to make API calls.
   scoped_ptr<CryptAuthClientFactory> cryptauth_client_factory_;
 
   // We only support one concurrent API call.
   scoped_ptr<CryptAuthClient> cryptauth_client_;
 
   // The flow for getting a list of reachable phones.
   scoped_ptr<ReachablePhoneFlow> reachable_phone_flow_;
 
   // Member variables related to CryptAuth debugging.
   // TODO(tengs): These members are temporarily used for development.
   scoped_ptr<PrefService> pref_service;

[sacomoto, 2015/08/27 12:09:17]

Please remove this too.

[Tim Song, 2015/08/27 18:28:03]

Done.

-  scoped_ptr<CryptAuthGCMManager> gcm_manager_;
-  scoped_ptr<CryptAuthEnrollmentManager> enrollment_manager_;
-  scoped_ptr<CryptAuthDeviceManager> device_manager_;
+
+  // True if we get a message from the loaded WebContents to know that it is
+  // initialized, and we can inject JavaScript.
+  bool web_contents_initialized_;
 
   // Member variables for connecting to and authenticating the remote device.
   // TODO(tengs): Support multiple simultaenous connections.
   scoped_ptr<SecureMessageDelegate> secure_message_delegate_;
   scoped_ptr<BluetoothLowEnergyDeviceWhitelist> ble_device_whitelist_;
   RemoteDevice selected_remote_device_;
   scoped_ptr<BluetoothThrottler> bluetooth_throttler_;
   scoped_ptr<ConnectionFinder> connection_finder_;
   scoped_ptr<Connection> connection_;
   scoped_ptr<Authenticator> authenticator_;
   scoped_ptr<SecureContext> secure_context_;
   scoped_ptr<ClientImpl> client_;
   scoped_ptr<RemoteStatusUpdate> last_remote_status_update_;
 
   base::WeakPtrFactory<ProximityAuthWebUIHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProximityAuthWebUIHandler);
 };
 
 }  // namespace proximity_auth
 
 #endif  // COMPONENTS_PROXIMITY_AUTH_WEBUI_PROXIMITY_AUTH_WEBUI_HANDLER_H_