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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 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 | 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/scoped_temp_dir.h" 6 #include "base/scoped_temp_dir.h"
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/password_manager/password_form_data.h" 12 #include "chrome/browser/password_manager/password_form_data.h"
13 #include "chrome/browser/password_manager/password_store_change.h" 13 #include "chrome/browser/password_manager/password_store_change.h"
14 #include "chrome/browser/password_manager/password_store_consumer.h" 14 #include "chrome/browser/password_manager/password_store_consumer.h"
15 #include "chrome/browser/password_manager/password_store_default.h" 15 #include "chrome/browser/password_manager/password_store_default.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/webdata/web_data_service.h" 17 #include "chrome/browser/webdata/web_data_service.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/signaling_task.h" 20 #include "chrome/test/base/signaling_task.h"
21 #include "chrome/test/base/testing_browser_process_test.h"
22 #include "chrome/test/base/testing_profile.h" 21 #include "chrome/test/base/testing_profile.h"
23 #include "content/common/notification_details.h" 22 #include "content/common/notification_details.h"
24 #include "content/common/notification_observer_mock.h" 23 #include "content/common/notification_observer_mock.h"
25 #include "content/common/notification_registrar.h" 24 #include "content/common/notification_registrar.h"
26 #include "content/common/notification_source.h" 25 #include "content/common/notification_source.h"
27 #include "testing/gmock/include/gmock/gmock.h" 26 #include "testing/gmock/include/gmock/gmock.h"
28 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
29 28
30 using base::WaitableEvent; 29 using base::WaitableEvent;
31 using testing::_; 30 using testing::_;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 91
93 WaitableEvent done_event_; 92 WaitableEvent done_event_;
94 NotificationRegistrar registrar_; 93 NotificationRegistrar registrar_;
95 NotificationObserverMock observer_; 94 NotificationObserverMock observer_;
96 }; 95 };
97 96
98 } // anonymous namespace 97 } // anonymous namespace
99 98
100 typedef std::vector<PasswordForm*> VectorOfForms; 99 typedef std::vector<PasswordForm*> VectorOfForms;
101 100
102 class PasswordStoreDefaultTest : public TestingBrowserProcessTest { 101 class PasswordStoreDefaultTest : public testing::Test {
103 protected: 102 protected:
104 PasswordStoreDefaultTest() 103 PasswordStoreDefaultTest()
105 : ui_thread_(BrowserThread::UI, &message_loop_), 104 : ui_thread_(BrowserThread::UI, &message_loop_),
106 db_thread_(BrowserThread::DB) { 105 db_thread_(BrowserThread::DB) {
107 } 106 }
108 107
109 virtual void SetUp() { 108 virtual void SetUp() {
110 ASSERT_TRUE(db_thread_.Start()); 109 ASSERT_TRUE(db_thread_.Start());
111 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 110 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
112 111
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 // Deleting the login should trigger a notification. 515 // Deleting the login should trigger a notification.
517 store->RemoveLogin(*form); 516 store->RemoveLogin(*form);
518 517
519 // Wait for PasswordStore to send the notification. 518 // Wait for PasswordStore to send the notification.
520 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, 519 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
521 new SignalingTask(&done)); 520 new SignalingTask(&done));
522 done.Wait(); 521 done.Wait();
523 522
524 store->Shutdown(); 523 store->Shutdown();
525 } 524 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698