Resolve function and variable conflict

When using Jumbo build, there are conflicts between and
The conflicts are the variable kUserCancelledError
and the function WebstoreInstallHelperResultToApiResult.
This commit solve the issues by renaming the variable and
function to something more file specific.

Bug: 850484
Change-Id: I600a036505ef731124ac6e4c3ea2f750a50ccad5
Reviewed-by: Ken Rockot <>
Commit-Queue: Oscar Johansson <>
Cr-Commit-Position: refs/heads/master@{#567165}
2 files changed