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

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

Issue 8680040: Group forms-related files in webkit/glue in a forms/ subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + another build fix Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "testing/gmock/include/gmock/gmock.h" 5 #include "testing/gmock/include/gmock/gmock.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/scoped_temp_dir.h" 11 #include "base/scoped_temp_dir.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/mock_keychain_mac.h" 15 #include "chrome/browser/mock_keychain_mac.h"
16 #include "chrome/browser/password_manager/password_store_consumer.h" 16 #include "chrome/browser/password_manager/password_store_consumer.h"
17 #include "chrome/browser/password_manager/password_store_mac.h" 17 #include "chrome/browser/password_manager/password_store_mac.h"
18 #include "chrome/browser/password_manager/password_store_mac_internal.h" 18 #include "chrome/browser/password_manager/password_store_mac_internal.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "content/test/test_browser_thread.h" 20 #include "content/test/test_browser_thread.h"
21 21
22 using content::BrowserThread; 22 using content::BrowserThread;
23 using webkit_glue::PasswordForm; 23 using webkit::forms::PasswordForm;
24 using testing::_; 24 using testing::_;
25 using testing::DoAll; 25 using testing::DoAll;
26 using testing::WithArg; 26 using testing::WithArg;
27 27
28 namespace { 28 namespace {
29 29
30 class MockPasswordStoreConsumer : public PasswordStoreConsumer { 30 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
31 public: 31 public:
32 MOCK_METHOD2(OnPasswordStoreRequestDone, 32 MOCK_METHOD2(OnPasswordStoreRequestDone,
33 void(CancelableRequestProvider::Handle, 33 void(CancelableRequestProvider::Handle,
34 const std::vector<webkit_glue::PasswordForm*>&)); 34 const std::vector<webkit::forms::PasswordForm*>&));
35 }; 35 };
36 36
37 ACTION(STLDeleteElements0) { 37 ACTION(STLDeleteElements0) {
38 STLDeleteContainerPointers(arg0.begin(), arg0.end()); 38 STLDeleteContainerPointers(arg0.begin(), arg0.end());
39 } 39 }
40 40
41 ACTION(QuitUIMessageLoop) { 41 ACTION(QuitUIMessageLoop) {
42 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 42 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
43 MessageLoop::current()->Quit(); 43 MessageLoop::current()->Quit();
44 } 44 }
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 EXPECT_EQ(0U, matching_items.size()) << "iteration " << i; 1019 EXPECT_EQ(0U, matching_items.size()) << "iteration " << i;
1020 } 1020 }
1021 STLDeleteElements(&matching_items); 1021 STLDeleteElements(&matching_items);
1022 1022
1023 login_db_->GetLogins(*query_form, &matching_items); 1023 login_db_->GetLogins(*query_form, &matching_items);
1024 EXPECT_EQ(updates[i].password ? 1U : 0U, matching_items.size()) 1024 EXPECT_EQ(updates[i].password ? 1U : 0U, matching_items.size())
1025 << "iteration " << i; 1025 << "iteration " << i;
1026 STLDeleteElements(&matching_items); 1026 STLDeleteElements(&matching_items);
1027 } 1027 }
1028 } 1028 }
OLDNEW
« no previous file with comments | « chrome/browser/password_manager/password_store_mac_internal.h ('k') | chrome/browser/password_manager/password_store_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698