[SPDY] Do not advertise SPDY/2 by default

[SPDY] Do not advertise SPDY/2 by default

Add a switch to re-enable advertising SPDY/2.

Use SPDY/3 instead of SPDY/2 for cases where SPDY is forced on. Also use SPDY/3 instead of SPDY/2 in tests.

Add "deprecated" to all enum constants involving SPDY/2.

Remove unused --enable-npn switch.

BUG=303957
R=darin@chromium.org, rtenneti@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227229

[akalin, 2013-10-04 08:42:53]

+rtenneti for review

[akalin, 2013-10-04 08:43:12]

+darin for chrome/ OWNERS

[ramant (doing other things), 2013-10-04 17:03:36]

https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
File net/http/http_server_properties.h (right):

https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
net/http/http_server_properties.h:21: DEPRECATED_NPN_SPDY_2 = 0,
unit tests seem to fail. Could you please take another look? 

http://build.chromium.org/p/tryserver.chromium/builders/linux_chromeos/builds...

[akalin, 2013-10-04 18:51:11]

ptal

https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
File net/http/http_server_properties.h (right):

https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
net/http/http_server_properties.h:21: DEPRECATED_NPN_SPDY_2 = 0,
On 2013/10/04 17:03:36, ramant wrote:
> unit tests seem to fail. Could you please take another look? 
> 
>
http://build.chromium.org/p/tryserver.chromium/builders/linux_chromeos/builds...

Done.

[ramant (doing other things), 2013-10-04 19:53:45]

On 2013/10/04 18:51:11, akalin wrote:
> ptal
> 
>
https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
> File net/http/http_server_properties.h (right):
> 
>
https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
> net/http/http_server_properties.h:21: DEPRECATED_NPN_SPDY_2 = 0,
> On 2013/10/04 17:03:36, ramant wrote:
> > unit tests seem to fail. Could you please take another look? 
> > 
> >
>
http://build.chromium.org/p/tryserver.chromium/builders/linux_chromeos/builds...
> 
> Done.

Would appreciate if can you sync/upload this CL after merging changes from the
tip?

Failed to apply patch for
chrome/browser/net/http_server_properties_manager_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/net/http_server_properties_manager_unittest.cc
  Hunk #1 FAILED at 152.
  Hunk #2 FAILED at 173.
  Hunk #3 FAILED at 218.
  3 out of 6 hunks FAILED -- saving rejects to file
chrome/browser/net/http_server_properties_manager_unittest.cc.rej

[akalin, 2013-10-04 19:55:26]

On 2013/10/04 19:53:45, ramant wrote:
> On 2013/10/04 18:51:11, akalin wrote:
> > ptal
> > 
> >
>
https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
> > File net/http/http_server_properties.h (right):
> > 
> >
>
https://codereview.chromium.org/25977005/diff/1/net/http/http_server_properti...
> > net/http/http_server_properties.h:21: DEPRECATED_NPN_SPDY_2 = 0,
> > On 2013/10/04 17:03:36, ramant wrote:
> > > unit tests seem to fail. Could you please take another look? 
> > > 
> > >
> >
>
http://build.chromium.org/p/tryserver.chromium/builders/linux_chromeos/builds...
> > 
> > Done.
> 
> Would appreciate if can you sync/upload this CL after merging changes from the
> tip?
> 
> Failed to apply patch for
> chrome/browser/net/http_server_properties_manager_unittest.cc:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file chrome/browser/net/http_server_properties_manager_unittest.cc
>   Hunk #1 FAILED at 152.
>   Hunk #2 FAILED at 173.
>   Hunk #3 FAILED at 218.
>   3 out of 6 hunks FAILED -- saving rejects to file
> chrome/browser/net/http_server_properties_manager_unittest.cc.rej

I did. Pretty sure those errors are because I just committed my other CL. I will
kick off the try jobs again.

[ramant (doing other things), 2013-10-04 21:43:47]

lgtm

[commit-bot: I haz the power, 2013-10-05 00:35:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/akalin@chromium.org/25977005/52001

[commit-bot: I haz the power, 2013-10-05 00:55:54]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[akalin, 2013-10-05 06:22:45]

On 2013/10/05 00:55:54, I haz the power (commit-bot) wrote:
> Retried try job too often on chromium_presubmit for step(s) presubmit
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

darin, ping?

[darin (slow to review), 2013-10-05 06:27:58]

LGTM

https://codereview.chromium.org/25977005/diff/52001/chrome/browser/io_thread.h
File chrome/browser/io_thread.h (right):

https://codereview.chromium.org/25977005/diff/52001/chrome/browser/io_thread....
chrome/browser/io_thread.h:224: // Enable SPDY with the given mode, which may
contain the following:
side-note: io_thread.h seems like the wrong place to be describing the format of
a mode string. it seems like this functionality could be broken out into a
separate file that lives in browser/net/ or elsewhere more net specific.

that might be good cleanup for most of the net related things in this class.

[commit-bot: I haz the power, 2013-10-05 19:37:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/akalin@chromium.org/25977005/52001

[akalin, 2013-10-05 19:40:17]

https://codereview.chromium.org/25977005/diff/52001/chrome/browser/io_thread.h
File chrome/browser/io_thread.h (right):

https://codereview.chromium.org/25977005/diff/52001/chrome/browser/io_thread....
chrome/browser/io_thread.h:224: // Enable SPDY with the given mode, which may
contain the following:
On 2013/10/05 06:27:58, darin wrote:
> side-note: io_thread.h seems like the wrong place to be describing the format
of
> a mode string. it seems like this functionality could be broken out into a
> separate file that lives in browser/net/ or elsewhere more net specific.
> 
> that might be good cleanup for most of the net related things in this class.

Yeah, that's crbug.com/190061 . i'll get to it one of these days...

[commit-bot: I haz the power, 2013-10-05 20:06:38]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[akalin, 2013-10-06 05:26:07]

Committed patchset #4 manually as r227229 (presubmit successful).

[commit-bot: I haz the power, 2013-10-06 05:26:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/akalin@chromium.org/25977005/86001

[commit-bot: I haz the power, 2013-10-06 05:26:25]

Failed to apply patch for
chrome/browser/chrome_net_benchmarking_message_filter.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chrome_net_benchmarking_message_filter.cc
  Hunk #1 FAILED at 112.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/chrome_net_benchmarking_message_filter.cc.rej

Patch:       chrome/browser/chrome_net_benchmarking_message_filter.cc
Index: chrome/browser/chrome_net_benchmarking_message_filter.cc
diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.cc
b/chrome/browser/chrome_net_benchmarking_message_filter.cc
index
4ad3fc7dce0e73e5f17d9820a8f6c6121906729b..04bc990c65ad3e684f0bbd124853c22d25de7006
100644
--- a/chrome/browser/chrome_net_benchmarking_message_filter.cc
+++ b/chrome/browser/chrome_net_benchmarking_message_filter.cc
@@ -112,7 +112,7 @@ void ChromeNetBenchmarkingMessageFilter::OnEnableSpdy(bool
enable) {
     return;
   }
   if (enable) {
-    net::HttpStreamFactory::EnableNpnSpdy();
+    net::HttpStreamFactory::EnableNpnSpdy3();
     net::HttpNetworkLayer::ForceAlternateProtocol();
   } else {
     net::HttpStreamFactory::EnableNpnHttpOnly();