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

Side by Side Diff: chrome/browser/password_manager/password_store_win_unittest.cc

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: X509_NAME -> WINCRYPT_X509_NAME, rebase Created 6 years, 1 month 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 <windows.h> 5 #include <windows.h>
6 #include <wincrypt.h>
7 #include <string> 6 #include <string>
Ryan Sleevi 2014/10/29 20:40:24 should be a newline between 5 and 6 here
davidben 2014/10/29 22:49:58 Done.
8 #include <vector> 7 #include <vector>
9 8
10 #include "base/bind.h" 9 #include "base/bind.h"
11 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
12 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
13 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
15 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
16 #include "base/stl_util.h" 15 #include "base/stl_util.h"
17 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
18 #include "base/time/time.h" 17 #include "base/time/time.h"
19 #include "chrome/browser/password_manager/password_store_win.h" 18 #include "chrome/browser/password_manager/password_store_win.h"
20 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
21 #include "components/os_crypt/ie7_password_win.h" 20 #include "components/os_crypt/ie7_password_win.h"
22 #include "components/password_manager/core/browser/password_form_data.h" 21 #include "components/password_manager/core/browser/password_form_data.h"
23 #include "components/password_manager/core/browser/password_store_consumer.h" 22 #include "components/password_manager/core/browser/password_store_consumer.h"
24 #include "components/password_manager/core/browser/webdata/logins_table.h" 23 #include "components/password_manager/core/browser/webdata/logins_table.h"
25 #include "components/password_manager/core/browser/webdata/password_web_data_ser vice_win.h" 24 #include "components/password_manager/core/browser/webdata/password_web_data_ser vice_win.h"
26 #include "components/password_manager/core/common/password_manager_pref_names.h" 25 #include "components/password_manager/core/common/password_manager_pref_names.h"
27 #include "components/webdata/common/web_database_service.h" 26 #include "components/webdata/common/web_database_service.h"
28 #include "content/public/test/test_browser_thread.h" 27 #include "content/public/test/test_browser_thread.h"
28 #include "crypto/wincrypt.h"
29 #include "testing/gmock/include/gmock/gmock.h" 29 #include "testing/gmock/include/gmock/gmock.h"
30 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
31 31
32 using autofill::PasswordForm; 32 using autofill::PasswordForm;
33 using base::WaitableEvent; 33 using base::WaitableEvent;
34 using content::BrowserThread; 34 using content::BrowserThread;
35 using password_manager::LoginDatabase; 35 using password_manager::LoginDatabase;
36 using password_manager::ContainsAllPasswordForms; 36 using password_manager::ContainsAllPasswordForms;
37 using password_manager::PasswordFormData; 37 using password_manager::PasswordFormData;
38 using password_manager::PasswordStore; 38 using password_manager::PasswordStore;
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 VectorOfForms expect_none; 429 VectorOfForms expect_none;
430 // expect that we get no results; 430 // expect that we get no results;
431 EXPECT_CALL( 431 EXPECT_CALL(
432 consumer, 432 consumer,
433 OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none))) 433 OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
434 .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop())); 434 .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
435 435
436 store_->GetAutofillableLogins(&consumer); 436 store_->GetAutofillableLogins(&consumer);
437 base::MessageLoop::current()->Run(); 437 base::MessageLoop::current()->Run();
438 } 438 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698