Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer()

Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None

Committed: https://crrev.com/b0ea59bf0f96b9cb8d43509b531726a1e65dda91
Cr-Commit-Position: refs/heads/master@{#427515}

[pkotwicz, 2016-10-18 23:40:57]

Description was changed from

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL removes:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
and replaces them with:
  EmbeddedTestServer#createAndStartServer()

BUG=None
TEST=None
==========

to

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None
==========

[pkotwicz, 2016-10-18 23:40:57]

pkotwicz@chromium.org changed reviewers:
+ jbudorick@chromium.org

[pkotwicz, 2016-10-18 23:41:11]

jbudorick@ PTAL

[jbudorick, 2016-10-19 15:32:49]

lgtm w/ nit

Nice cleanup!

https://codereview.chromium.org/2431753003/diff/1/net/test/android/javatests/...
File
net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
(right):

https://codereview.chromium.org/2431753003/diff/1/net/test/android/javatests/...
net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java:224:
public static EmbeddedTestServer createAndStartServer(Context context)
Please add a javadoc for this function and a blank line after
createAndStartDefaultServer.

[pkotwicz, 2016-10-19 17:59:53]

pkotwicz@chromium.org changed reviewers:
+ michaelbai@chromium.org, tedchoc@chromium.org

[pkotwicz, 2016-10-19 17:59:54]

tedchoc@ for OWNERS
michaelbai@ for android_webview OWNERS

[pkotwicz, 2016-10-19 18:01:19]

pkotwicz@chromium.org changed reviewers:
+ mef@chromium.org

[pkotwicz, 2016-10-19 18:01:46]

tedchoc@ for OWNERS
michaelbai@ for android_webview/ OWNERS
mef@ for net/ OWNERS

[Ted C, 2016-10-19 18:08:41]

lgtm

[pkotwicz, 2016-10-20 21:23:28]

michaelbai@ for android_webview/ OWNERS
mef@ for net/ OWNERS

[pkotwicz, 2016-10-24 15:34:19]

michaelbai@ Ping!

[michaelbai, 2016-10-25 18:05:32]

android_webview LGTM

[pkotwicz, 2016-10-25 18:11:17]

mef@ for net/ and components/cronet/ OWNERS

[pkotwicz, 2016-10-25 18:13:48]

pkotwicz@chromium.org changed reviewers:
+ mmenke@chromium.org

[pkotwicz, 2016-10-25 18:13:49]

mmenke: for net/ and components/cronet/ OWNERS (mef@ seems to be busy)

[mmenke, 2016-10-25 18:16:47]

On 2016/10/25 18:13:49, pkotwicz wrote:
> mmenke: for net/ and components/cronet/ OWNERS (mef@ seems to be busy)

net/ LGTM

[pkotwicz, 2016-10-25 21:55:04]

The CQ bit was checked by pkotwicz@chromium.org

[pkotwicz, 2016-10-25 21:55:05]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org, tedchoc@chromium.org, michaelbai@chromium.org,
mmenke@chromium.org
Link to the patchset: https://codereview.chromium.org/2431753003/#ps40001
(title: "Merge branch 'master' into webapk_embedded_test_server")

[commit-bot: I haz the power, 2016-10-25 21:55:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-25 22:40:41]

Description was changed from

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None
==========

to

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None
==========

[commit-bot: I haz the power, 2016-10-25 22:40:42]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-10-25 22:44:06]

Description was changed from

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None
==========

to

==========
Merge EmbeddedTestServer#createAndStartDefaultServer() and
createAndStartFileServer()

This CL changes call sites for:
  EmbeddedTestServer#createAndStartDefaultServer()
  EmbeddedTestServer#createAndStartFileServer()
to use instead:
  EmbeddedTestServer#createAndStartServer()

EmbeddedTestServer#createAndStartDefaultServer() and
EmbeddedTestServer#createAndStartFileServer() will be deleted in a followup CL.

BUG=None
TEST=None

Committed: https://crrev.com/b0ea59bf0f96b9cb8d43509b531726a1e65dda91
Cr-Commit-Position: refs/heads/master@{#427515}
==========

[commit-bot: I haz the power, 2016-10-25 22:44:08]

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