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

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

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 4 years, 12 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 <utility>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
15 #include "components/password_manager/core/browser/mock_password_store.h" 16 #include "components/password_manager/core/browser/mock_password_store.h"
16 #include "components/password_manager/core/browser/password_autofill_manager.h" 17 #include "components/password_manager/core/browser/password_autofill_manager.h"
17 #include "components/password_manager/core/browser/password_manager_driver.h" 18 #include "components/password_manager/core/browser/password_manager_driver.h"
(...skipping 22 matching lines...) Expand all
40 class MockStoreResultFilter : public CredentialsFilter { 41 class MockStoreResultFilter : public CredentialsFilter {
41 public: 42 public:
42 MOCK_CONST_METHOD1(FilterResultsPtr, 43 MOCK_CONST_METHOD1(FilterResultsPtr,
43 void(ScopedVector<autofill::PasswordForm>* results)); 44 void(ScopedVector<autofill::PasswordForm>* results));
44 MOCK_CONST_METHOD1(ShouldSave, bool(const autofill::PasswordForm& form)); 45 MOCK_CONST_METHOD1(ShouldSave, bool(const autofill::PasswordForm& form));
45 46
46 // GMock cannot handle move-only arguments. 47 // GMock cannot handle move-only arguments.
47 ScopedVector<autofill::PasswordForm> FilterResults( 48 ScopedVector<autofill::PasswordForm> FilterResults(
48 ScopedVector<autofill::PasswordForm> results) const override { 49 ScopedVector<autofill::PasswordForm> results) const override {
49 FilterResultsPtr(&results); 50 FilterResultsPtr(&results);
50 return results.Pass(); 51 return results;
51 } 52 }
52 }; 53 };
53 54
54 class MockPasswordManagerClient : public StubPasswordManagerClient { 55 class MockPasswordManagerClient : public StubPasswordManagerClient {
55 public: 56 public:
56 MockPasswordManagerClient() { 57 MockPasswordManagerClient() {
57 ON_CALL(*this, GetStoreResultFilter()).WillByDefault(Return(&filter_)); 58 ON_CALL(*this, GetStoreResultFilter()).WillByDefault(Return(&filter_));
58 ON_CALL(filter_, ShouldSave(_)).WillByDefault(Return(true)); 59 ON_CALL(filter_, ShouldSave(_)).WillByDefault(Return(true));
59 } 60 }
60 61
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 public: 95 public:
95 MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&)); 96 MOCK_METHOD1(FillPasswordForm, void(const autofill::PasswordFormFillData&));
96 MOCK_METHOD0(GetPasswordManager, PasswordManager*()); 97 MOCK_METHOD0(GetPasswordManager, PasswordManager*());
97 MOCK_METHOD0(GetPasswordAutofillManager, PasswordAutofillManager*()); 98 MOCK_METHOD0(GetPasswordAutofillManager, PasswordAutofillManager*());
98 }; 99 };
99 100
100 // Invokes the password store consumer with a single copy of |form|. 101 // Invokes the password store consumer with a single copy of |form|.
101 ACTION_P(InvokeConsumer, form) { 102 ACTION_P(InvokeConsumer, form) {
102 ScopedVector<PasswordForm> result; 103 ScopedVector<PasswordForm> result;
103 result.push_back(make_scoped_ptr(new PasswordForm(form))); 104 result.push_back(make_scoped_ptr(new PasswordForm(form)));
104 arg0->OnGetPasswordStoreResults(result.Pass()); 105 arg0->OnGetPasswordStoreResults(std::move(result));
105 } 106 }
106 107
107 ACTION(InvokeEmptyConsumerWithForms) { 108 ACTION(InvokeEmptyConsumerWithForms) {
108 arg0->OnGetPasswordStoreResults(ScopedVector<PasswordForm>()); 109 arg0->OnGetPasswordStoreResults(ScopedVector<PasswordForm>());
109 } 110 }
110 111
111 ACTION_P(SaveToScopedPtr, scoped) { scoped->reset(arg0); } 112 ACTION_P(SaveToScopedPtr, scoped) { scoped->reset(arg0); }
112 113
113 } // namespace 114 } // namespace
114 115
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 observed.clear(); 1309 observed.clear();
1309 manager()->OnPasswordFormsRendered(&driver_, observed, true); 1310 manager()->OnPasswordFormsRendered(&driver_, observed, true);
1310 1311
1311 EXPECT_EQ(android_form.username_value, form_data.username_field.value); 1312 EXPECT_EQ(android_form.username_value, form_data.username_field.value);
1312 EXPECT_EQ(android_form.password_value, form_data.password_field.value); 1313 EXPECT_EQ(android_form.password_value, form_data.password_field.value);
1313 EXPECT_FALSE(form_data.wait_for_username); 1314 EXPECT_FALSE(form_data.wait_for_username);
1314 EXPECT_EQ(android_form.signon_realm, form_data.preferred_realm); 1315 EXPECT_EQ(android_form.signon_realm, form_data.preferred_realm);
1315 } 1316 }
1316 1317
1317 } // namespace password_manager 1318 } // namespace password_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698