Reland of Add a unittest for PasswordController

ios/chrome/browser/passwords/password_controller.mm

 // Copyright 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.
 
 #import "ios/chrome/browser/passwords/password_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 21 matching lines @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h"
 #import "ios/chrome/browser/passwords/js_password_manager.h"
 #import "ios/chrome/browser/passwords/password_generation_agent.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
 #include "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 #import "ios/web/public/web_state/web_state.h"
-#import "ios/web/public/web_state/web_state_observer_bridge.h"
 #include "url/gurl.h"
 
 using password_manager::PasswordFormManager;
 using password_manager::PasswordGenerationManager;
 using password_manager::PasswordManager;
 using password_manager::PasswordManagerClient;
 using password_manager::PasswordManagerDriver;
 
-@interface PasswordController ()<CRWWebStateObserver, FormSuggestionProvider>
+@interface PasswordController ()<FormSuggestionProvider>
 
 // Parses the |jsonString| which contatins the password forms found on a web
 // page to populate the |forms| vector.
 - (void)getPasswordForms:(std::vector<autofill::PasswordForm>*)forms
            fromFormsJSON:(NSString*)jsonString
                  pageURL:(const GURL&)pageURL;
 
 // Processes the JSON string returned as a result of extracting the submitted
 // form data and populates |form|. Returns YES on success. NO otherwise.
 // |form| cannot be nil.
@@ skipping 175 matching lines @@
 
   // The pending form data.
   scoped_ptr<autofill::PasswordFormFillData> formData_;
 
   // Bridge to observe WebState from Objective-C.
   scoped_ptr<web::WebStateObserverBridge> webStateObserverBridge_;
 }
 
 - (instancetype)initWithWebState:(web::WebState*)webState
              passwordsUiDelegate:(id<PasswordsUiDelegate>)UIDelegate {
+  self = [self initWithWebState:webState
+            passwordsUiDelegate:UIDelegate
+                         client:nullptr];
+  return self;
+}
+
+- (instancetype)initWithWebState:(web::WebState*)webState
+             passwordsUiDelegate:(id<PasswordsUiDelegate>)UIDelegate
+                          client:(scoped_ptr<PasswordManagerClient>)
+                                     passwordManagerClient {
   DCHECK(webState);
   self = [super init];
   if (self) {
     webStateObserverBridge_.reset(
         new web::WebStateObserverBridge(webState, self));
-    passwordManagerClient_.reset(new IOSChromePasswordManagerClient(self));
+    if (passwordManagerClient)
+      passwordManagerClient_ = std::move(passwordManagerClient);
+    else
+      passwordManagerClient_.reset(new IOSChromePasswordManagerClient(self));
     passwordManager_.reset(new PasswordManager(passwordManagerClient_.get()));
     passwordManagerDriver_.reset(new IOSChromePasswordManagerDriver(self));
     if (experimental_flags::IsPasswordGenerationEnabled() &&
         !passwordManagerClient_->IsOffTheRecord()) {
       passwordGenerationManager_.reset(new PasswordGenerationManager(
           passwordManagerClient_.get(), passwordManagerDriver_.get()));
       passwordGenerationAgent_.reset([[PasswordGenerationAgent alloc]
                initWithWebState:webState
                 passwordManager:passwordManager_.get()
           passwordManagerDriver:passwordManagerDriver_.get()
@@ skipping 533 matching lines @@
 
 - (PasswordManager*)passwordManager {
   return passwordManager_.get();
 }
 
 - (JsPasswordManager*)passwordJsManager {
   return passwordJsManager_;
 }
 
 @end