diff options
| author | mnissler <mnissler@chromium.org> | 2015-08-05 02:20:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 09:22:07 +0000 |
| commit | fb4a4c60596d52a2f3ab26ab94399d3ebd5a64c1 (patch) | |
| tree | f398017f1630d0d6923b3b1a5e136527051a503e /chromeos/dbus/mock_session_manager_client.h | |
| parent | 7ae8d9c314c283e9d2d8b72e106d6625a009e7bc (diff) | |
| download | chromium_src-fb4a4c60596d52a2f3ab26ab94399d3ebd5a64c1.zip chromium_src-fb4a4c60596d52a2f3ab26ab94399d3ebd5a64c1.tar.gz chromium_src-fb4a4c60596d52a2f3ab26ab94399d3ebd5a64c1.tar.bz2 | |
SessionManagerClient::RestartJob: Use argv instead of string.
This changes the interface to session_manager to pass the command line
as an array instead of a string. The previous code path would
(incorrectly) quote arguments and combine them into a string, and then
again parse and unquote them on the session_manager side, which is
unnecessary and error-prone. This changes the code to pass an array of
strings in the DBus call, which simplifies things considerably.
BUG=chromium:433172
TEST=Guest session starts successfully.
Review URL: https://codereview.chromium.org/1268973004
Cr-Commit-Position: refs/heads/master@{#341873}
Diffstat (limited to 'chromeos/dbus/mock_session_manager_client.h')
| -rw-r--r-- | chromeos/dbus/mock_session_manager_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h index 3a88e52..17f0caf 100644 --- a/chromeos/dbus/mock_session_manager_client.h +++ b/chromeos/dbus/mock_session_manager_client.h @@ -24,7 +24,7 @@ class MockSessionManagerClient : public SessionManagerClient { MOCK_CONST_METHOD1(HasObserver, bool(const Observer*)); MOCK_CONST_METHOD0(IsScreenLocked, bool(void)); MOCK_METHOD0(EmitLoginPromptVisible, void(void)); - MOCK_METHOD2(RestartJob, void(int, const std::string&)); + MOCK_METHOD1(RestartJob, void(const std::vector<std::string>&)); MOCK_METHOD1(StartSession, void(const std::string&)); MOCK_METHOD0(StopSession, void(void)); MOCK_METHOD0(NotifySupervisedUserCreationStarted, void(void)); |