Fix broken unittests.

Fix broken setup_unittests.

BUG=505039, 505301
Committed: https://crrev.com/eba39e1fed8e9406bcfb7db180f5f1df4e54160e
Cr-Commit-Position: refs/heads/master@{#337394}

[grt (UTC plus 2), 2015-06-30 15:45:12]

grt@chromium.org changed reviewers:
+ gab@chromium.org

[grt (UTC plus 2), 2015-06-30 15:47:23]

PTAL. Patch set 2 is just a "cl format". Thanks.

[grt (UTC plus 2), 2015-06-30 16:37:43]

The CQ bit was checked by grt@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-06-30 16:37:59]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1214343003/20001

[commit-bot: I haz the power, 2015-06-30 16:46:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-30 16:46:15]

Dry run: This issue passed the CQ dry run.

[gab, 2015-07-02 12:19:24]

IIUC, the issue was that the Mock had derailed from the real interface?
Surprised that this is even possible..? GMock lets you override non-existent
signatures?!

Anyways, pre-emptive lgtm since I'm going OOO and this is a fine CL, but I'd
like to understand why this wasn't a build failure?

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
File chrome/installer/setup/install_worker_unittest.cc (right):

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:45: using ::testing::_;
nit: Doesn't '_' sort first? (I've seen it first in other files)

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:59: const std::wstring&));
optional: Can you add param names here? This is pretty much impossible to read
without the interface side-by-side otherwise (though I guess this was the case
before as well...)

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:488:
EXPECT_CALL(work_item_list, AddDeleteRegKeyWorkItem(_, _, _))
Curious why you're adding those? Is this required for the fix or are you just
adding a user of this updated section of the Mock interface?

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:581: // Per-machine
multi-install Chrome is to be installed.
Took me a few seconds to parse the difference here, perhaps highlight " *to be*
" ?

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:595:
.Times(testing::AnyNumber());
Fwd-decl AnyNumber() like all other testing:: shenanigans?

[grt (UTC plus 2), 2015-07-06 14:44:02]

Thanks

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
File chrome/installer/setup/install_worker_unittest.cc (right):

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:45: using ::testing::_;
On 2015/07/02 12:19:23, gab wrote:
> nit: Doesn't '_' sort first? (I've seen it first in other files)

Done.

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:59: const std::wstring&));
On 2015/07/02 12:19:23, gab wrote:
> optional: Can you add param names here? This is pretty much impossible to read
> without the interface side-by-side otherwise (though I guess this was the case
> before as well...)

Not doing now.

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:488:
EXPECT_CALL(work_item_list, AddDeleteRegKeyWorkItem(_, _, _))
On 2015/07/02 12:19:23, gab wrote:
> Curious why you're adding those? Is this required for the fix or are you just
> adding a user of this updated section of the Mock interface?

Required for the fix. The impl needs an instance to be returned from these
calls.

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:581: // Per-machine
multi-install Chrome is to be installed.
On 2015/07/02 12:19:23, gab wrote:
> Took me a few seconds to parse the difference here, perhaps highlight " *to
be*
> " ?

Done.

https://codereview.chromium.org/1214343003/diff/20001/chrome/installer/setup/...
chrome/installer/setup/install_worker_unittest.cc:595:
.Times(testing::AnyNumber());
On 2015/07/02 12:19:23, gab wrote:
> Fwd-decl AnyNumber() like all other testing:: shenanigans?

Done.

[grt (UTC plus 2), 2015-07-06 14:44:05]

The CQ bit was checked by grt@chromium.org

[grt (UTC plus 2), 2015-07-06 14:44:05]

The patchset sent to the CQ was uploaded after l-g-t-m from gab@chromium.org
Link to the patchset: https://codereview.chromium.org/1214343003/#ps40001
(title: "review comments")

[commit-bot: I haz the power, 2015-07-06 14:44:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1214343003/40001

[commit-bot: I haz the power, 2015-07-06 14:52:33]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-07-06 14:53:38]

Patchset 3 (id:??) landed as
https://crrev.com/eba39e1fed8e9406bcfb7db180f5f1df4e54160e
Cr-Commit-Position: refs/heads/master@{#337394}