android: Merge WrapContext and WrapContextWithAttributes into a single function.

android: Merge WrapContext and WrapContextWithAttributes into a single function.

Refactored these two functions into a single one to ease the
transition of https://codereview.chromium.org/920443003.

Tested on Android (with Nexus 5 device) with the following command
lines:

$ ./build/gyp_chromium -DOS=android -Goutput_dir=out_android
$ ninja -C out_android/Debug content_unittests content_unittests_apk
$ export CHROMIUM_OUT_DIR=out_android
$ build/android/test_runner.py gtest -s content_unittests --debug

BUG=338338
TEST=see above
R=boliu@chromium.org

Committed: https://crrev.com/838538baf1aed52e0d85a9ac5a5969f5b0b34751
Cr-Commit-Position: refs/heads/master@{#324111}

[tfarina, 2015-04-07 15:55:41]

Is this OK?

[boliu, 2015-04-07 19:18:39]

yep, good clean up

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
File content/browser/android/in_process/synchronous_compositor_factory_impl.cc
(right):

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
content/browser/android/in_process/synchronous_compositor_factory_impl.cc:176:
WrapContext(context.Pass(), GetDefaultAttribs()), debug_name);
use |attributes|

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
content/browser/android/in_process/synchronous_compositor_factory_impl.cc:190:
GetDefaultAttribs()),
Only call GetDefaultAttribs() once, save it in a local variable

[tfarina, 2015-04-07 20:04:04]

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
File content/browser/android/in_process/synchronous_compositor_factory_impl.cc
(right):

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
content/browser/android/in_process/synchronous_compositor_factory_impl.cc:176:
WrapContext(context.Pass(), GetDefaultAttribs()), debug_name);
On 2015/04/07 19:18:39, boliu wrote:
> use |attributes|

Done. But note that before it was using GetDefaultAttribs(). This change does
not hurt, right?

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
content/browser/android/in_process/synchronous_compositor_factory_impl.cc:190:
GetDefaultAttribs()),
On 2015/04/07 19:18:39, boliu wrote:
> Only call GetDefaultAttribs() once, save it in a local variable

Done.

[boliu, 2015-04-07 20:05:58]

lgtm

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
File content/browser/android/in_process/synchronous_compositor_factory_impl.cc
(right):

https://codereview.chromium.org/1064033002/diff/1/content/browser/android/in_...
content/browser/android/in_process/synchronous_compositor_factory_impl.cc:176:
WrapContext(context.Pass(), GetDefaultAttribs()), debug_name);
On 2015/04/07 20:04:04, tfarina wrote:
> On 2015/04/07 19:18:39, boliu wrote:
> > use |attributes|
> 
> Done. But note that before it was using GetDefaultAttribs(). This change does
> not hurt, right?

Yeah shouldn't hurt. Probably would have been a bug if anything depended on
those values in this context.

[tfarina, 2015-04-07 20:33:41]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2015-04-07 20:34:29]

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

[commit-bot: I haz the power, 2015-04-07 20:41:37]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-04-07 20:42:28]

Patchset 2 (id:??) landed as
https://crrev.com/838538baf1aed52e0d85a9ac5a5969f5b0b34751
Cr-Commit-Position: refs/heads/master@{#324111}