Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: components/password_manager/core/browser/password_manager_unittest.cc

Issue 616283002: Revert "Replace OVERRIDE with its C++11 counterpart in components/password_manager/" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/password_manager/core/browser/password_manager.h" 5 #include "components/password_manager/core/browser/password_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 MOCK_CONST_METHOD2(IsSyncAccountCredential, 48 MOCK_CONST_METHOD2(IsSyncAccountCredential,
49 bool(const std::string&, const std::string&)); 49 bool(const std::string&, const std::string&));
50 MOCK_METHOD1(PromptUserToSavePasswordPtr, void(PasswordFormManager*)); 50 MOCK_METHOD1(PromptUserToSavePasswordPtr, void(PasswordFormManager*));
51 MOCK_METHOD1(AutomaticPasswordSavePtr, void(PasswordFormManager*)); 51 MOCK_METHOD1(AutomaticPasswordSavePtr, void(PasswordFormManager*));
52 MOCK_METHOD0(GetPasswordStore, PasswordStore*()); 52 MOCK_METHOD0(GetPasswordStore, PasswordStore*());
53 MOCK_METHOD0(GetPrefs, PrefService*()); 53 MOCK_METHOD0(GetPrefs, PrefService*());
54 MOCK_METHOD0(GetDriver, PasswordManagerDriver*()); 54 MOCK_METHOD0(GetDriver, PasswordManagerDriver*());
55 55
56 // Workaround for scoped_ptr<> lacking a copy constructor. 56 // Workaround for scoped_ptr<> lacking a copy constructor.
57 virtual bool PromptUserToSavePassword( 57 virtual bool PromptUserToSavePassword(
58 scoped_ptr<PasswordFormManager> manager) override { 58 scoped_ptr<PasswordFormManager> manager) OVERRIDE {
59 PromptUserToSavePasswordPtr(manager.release()); 59 PromptUserToSavePasswordPtr(manager.release());
60 return false; 60 return false;
61 } 61 }
62 virtual void AutomaticPasswordSave( 62 virtual void AutomaticPasswordSave(
63 scoped_ptr<PasswordFormManager> manager) override { 63 scoped_ptr<PasswordFormManager> manager) OVERRIDE {
64 AutomaticPasswordSavePtr(manager.release()); 64 AutomaticPasswordSavePtr(manager.release());
65 } 65 }
66 }; 66 };
67 67
68 class MockPasswordManagerDriver : public StubPasswordManagerDriver { 68 class MockPasswordManagerDriver : public StubPasswordManagerDriver {
69 public: 69 public:
70 MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&)); 70 MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&));
71 MOCK_METHOD0(GetPasswordManager, PasswordManager*()); 71 MOCK_METHOD0(GetPasswordManager, PasswordManager*());
72 MOCK_METHOD0(GetPasswordAutofillManager, PasswordAutofillManager*()); 72 MOCK_METHOD0(GetPasswordAutofillManager, PasswordAutofillManager*());
73 MOCK_METHOD0(DidLastPageLoadEncounterSSLErrors, bool()); 73 MOCK_METHOD0(DidLastPageLoadEncounterSSLErrors, bool());
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 true); // The post-navigation layout. 865 true); // The post-navigation layout.
866 866
867 ASSERT_TRUE(form_to_save.get()); 867 ASSERT_TRUE(form_to_save.get());
868 EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))); 868 EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form)));
869 869
870 // Simulate saving the form, as if the info bar was accepted. 870 // Simulate saving the form, as if the info bar was accepted.
871 form_to_save->Save(); 871 form_to_save->Save();
872 } 872 }
873 873
874 } // namespace password_manager 874 } // namespace password_manager
OLDNEW
« no previous file with comments | « components/password_manager/core/browser/password_manager.h ('k') | components/password_manager/core/browser/password_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698