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/chromeos/dbus/service_provider_test_helper.h

Issue 12092061: Code cleaning: Uses scoped_ptr<> to express ownership rather than writing ownership in comments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added chrome/browser/password_manager/native_backend_kwallet_x_unitte\ Created 7 years, 10 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) 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 #ifndef CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 // Setups return signal callback. It's optional and don't need to be called 46 // Setups return signal callback. It's optional and don't need to be called
47 // if tested method doesn't use signal to return results. 47 // if tested method doesn't use signal to return results.
48 void SetUpReturnSignal( 48 void SetUpReturnSignal(
49 const std::string& interface_name, 49 const std::string& interface_name,
50 const std::string& signal_name, 50 const std::string& signal_name,
51 dbus::ObjectProxy::SignalCallback signal_callback, 51 dbus::ObjectProxy::SignalCallback signal_callback,
52 dbus::ObjectProxy::OnConnectedCallback on_connected_callback); 52 dbus::ObjectProxy::OnConnectedCallback on_connected_callback);
53 53
54 // Calls tested dbus method. 54 // Calls tested dbus method.
55 dbus::Response* CallMethod(dbus::MethodCall* method_call); 55 scoped_ptr<dbus::Response> CallMethod(dbus::MethodCall* method_call);
56 56
57 // Cleanups helper. Should be called after |CallMethod()|. 57 // Cleanups helper. Should be called after |CallMethod()|.
58 void TearDown(); 58 void TearDown();
59 59
60 private: 60 private:
61 // Behaves as |mock_exported_object_|'s ExportMethod(). 61 // Behaves as |mock_exported_object_|'s ExportMethod().
62 void MockExportMethod( 62 void MockExportMethod(
63 const std::string& interface_name, 63 const std::string& interface_name,
64 const std::string& method_name, 64 const std::string& method_name,
65 dbus::ExportedObject::MethodCallCallback method_callback, 65 dbus::ExportedObject::MethodCallCallback method_callback,
66 dbus::ExportedObject::OnExportedCallback on_exported_callback); 66 dbus::ExportedObject::OnExportedCallback on_exported_callback);
67 67
68 // Calls exported method and waits for a response for |mock_object_proxy_|. 68 // Calls exported method and waits for a response for |mock_object_proxy_|.
69 dbus::Response* MockCallMethodAndBlock(dbus::MethodCall* method_call, 69 dbus::Response* MockCallMethodAndBlock(
70 ::testing::Unused); 70 dbus::MethodCall* method_call,
71 ::testing::Unused);
71 72
72 // Behaves as |mock_object_proxy_|'s ConnectToSignal(). 73 // Behaves as |mock_object_proxy_|'s ConnectToSignal().
73 void MockConnectToSignal( 74 void MockConnectToSignal(
74 const std::string& interface_name, 75 const std::string& interface_name,
75 const std::string& signal_name, 76 const std::string& signal_name,
76 dbus::ObjectProxy::SignalCallback signal_callback, 77 dbus::ObjectProxy::SignalCallback signal_callback,
77 dbus::ObjectProxy::OnConnectedCallback connected_callback); 78 dbus::ObjectProxy::OnConnectedCallback connected_callback);
78 79
79 // Behaves as |mock_exported_object_|'s SendSignal(). 80 // Behaves as |mock_exported_object_|'s SendSignal().
80 void MockSendSignal(dbus::Signal* signal); 81 void MockSendSignal(dbus::Signal* signal);
81 82
82 // Receives a response and makes it available to MockCallMethodAndBlock(). 83 // Receives a response and makes it available to MockCallMethodAndBlock().
83 void OnResponse(dbus::Response* response); 84 void OnResponse(scoped_ptr<dbus::Response> response);
84 85
85 scoped_refptr<dbus::MockBus> mock_bus_; 86 scoped_refptr<dbus::MockBus> mock_bus_;
86 scoped_refptr<dbus::MockExportedObject> mock_exported_object_; 87 scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
87 scoped_refptr<dbus::MockObjectProxy> mock_object_proxy_; 88 scoped_refptr<dbus::MockObjectProxy> mock_object_proxy_;
88 dbus::ExportedObject::MethodCallCallback method_callback_; 89 dbus::ExportedObject::MethodCallCallback method_callback_;
89 dbus::ObjectProxy::SignalCallback on_signal_callback_; 90 dbus::ObjectProxy::SignalCallback on_signal_callback_;
90 MessageLoop message_loop_; 91 MessageLoop message_loop_;
91 bool response_received_; 92 bool response_received_;
92 scoped_ptr<dbus::Response> response_; 93 scoped_ptr<dbus::Response> response_;
93 }; 94 };
94 95
95 } // namespace chromeos 96 } // namespace chromeos
96 97
97 #endif // CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_ 98 #endif // CHROME_BROWSER_CHROMEOS_DBUS_SERVICE_PROVIDER_TEST_HELPER_H_
98
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698