Revert 233116 "Revert 233071 "Migrate to Openbox from IceWM (In ..."

openbox should theoretically be installed everywhere now.

> Revert 233071 "Migrate to Openbox from IceWM (In chrome scripts)"
> 
> Looks like openbox wasn't installed on everything.
> 
> > Migrate to Openbox from IceWM (In chrome scripts)
> > 
> > BUG=125106
> > R=maruel@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/55083004
> 
> BUG=125106, 308335
> TBR=erg@chromium.org
> 
> Review URL: https://codereview.chromium.org/60343005

TBR=erg@chromium.org

Review URL: https://codereview.chromium.org/61643009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233702 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 233702
[sync] Re-enable TwoClientAppsSyncTest.Merge

TwoClientAppsSyncTest.Merge was marked as flaky several months ago.
Investigations have not yielded any obvious failure cause. The test
passes with a large value for --gtest_repeat.

This patch re-enables the test assuming the trybots like it.

BUG=226055
TEST=TwoClientAppsSyncTest.Merge
R=pavely@chromium.org

Review URL: https://codereview.chromium.org/61763012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233703 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 233703