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

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

Issue 8873032: Removing MessageLoop::QuitTask() from chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert 3 more problematic files 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 <algorithm> 5 #include <algorithm>
6 #include <map> 6 #include <map>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 EXPECT_CALL(*mock_session_bus_, GetObjectProxy( 247 EXPECT_CALL(*mock_session_bus_, GetObjectProxy(
248 "org.kde.kwalletd", 248 "org.kde.kwalletd",
249 "/modules/kwalletd")) 249 "/modules/kwalletd"))
250 .WillRepeatedly(Return(mock_kwallet_proxy_.get())); 250 .WillRepeatedly(Return(mock_kwallet_proxy_.get()));
251 251
252 EXPECT_CALL(*mock_session_bus_, 252 EXPECT_CALL(*mock_session_bus_,
253 ShutdownAndBlock()).WillOnce(Return()).WillRepeatedly(Return()); 253 ShutdownAndBlock()).WillOnce(Return()).WillRepeatedly(Return());
254 } 254 }
255 255
256 void NativeBackendKWalletTest::TearDown() { 256 void NativeBackendKWalletTest::TearDown() {
257 MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); 257 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
258 MessageLoop::current()->Run(); 258 MessageLoop::current()->Run();
259 db_thread_.Stop(); 259 db_thread_.Stop();
260 } 260 }
261 261
262 dbus::Response* NativeBackendKWalletTest::KLauncherMethodCall( 262 dbus::Response* NativeBackendKWalletTest::KLauncherMethodCall(
263 dbus::MethodCall* method_call, testing::Unused) { 263 dbus::MethodCall* method_call, testing::Unused) {
264 EXPECT_EQ("org.kde.KLauncher", method_call->GetInterface()); 264 EXPECT_EQ("org.kde.KLauncher", method_call->GetInterface());
265 EXPECT_EQ("start_service_by_desktop_name", method_call->GetMember()); 265 EXPECT_EQ("start_service_by_desktop_name", method_call->GetMember());
266 266
267 klauncher_contacted_ = true; 267 klauncher_contacted_ = true;
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 983
984 RunDBThread(); 984 RunDBThread();
985 985
986 // The other two copies of the password in different profiles should remain. 986 // The other two copies of the password in different profiles should remain.
987 CheckPasswordForms("Chrome Form Data", expected); 987 CheckPasswordForms("Chrome Form Data", expected);
988 CheckPasswordForms("Chrome Form Data (42)", expected); 988 CheckPasswordForms("Chrome Form Data (42)", expected);
989 expected.clear(); 989 expected.clear();
990 CheckPasswordForms("Chrome Form Data (24)", expected); 990 CheckPasswordForms("Chrome Form Data (24)", expected);
991 } 991 }
992 } 992 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698