SPDY - chrome:loadtimes() should display negotiated NPN protocol.

BUG=108472
R=willchan
TEST=in js console chrome:loadtimes() should print SPDY 
protocol that was negotiated.

Review URL: http://codereview.chromium.org/9413038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123857 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 6 deletions

diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h
index 74d0515..e778707 100644
--- a/content/public/renderer/document_state.h
+++ b/content/public/renderer/document_state.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -140,23 +140,30 @@ class DocumentState : public WebKit::WebDataSource::ExtraData {
   }
 
   // Indicator if SPDY was used as part of this page load.
-  void set_was_fetched_via_spdy(bool value) { was_fetched_via_spdy_ = value; }
   bool was_fetched_via_spdy() const { return was_fetched_via_spdy_; }
+  void set_was_fetched_via_spdy(bool value) { was_fetched_via_spdy_ = value; }
 
-  void set_was_npn_negotiated(bool value) { was_npn_negotiated_ = value; }
   bool was_npn_negotiated() const { return was_npn_negotiated_; }
+  void set_was_npn_negotiated(bool value) { was_npn_negotiated_ = value; }
 
-  void set_was_alternate_protocol_available(bool value) {
-    was_alternate_protocol_available_ = value;
+  const std::string& npn_negotiated_protocol() const {
+    return npn_negotiated_protocol_;
+  }
+  void set_npn_negotiated_protocol(const std::string& value) {
+    npn_negotiated_protocol_ = value;
   }
+
   bool was_alternate_protocol_available() const {
     return was_alternate_protocol_available_;
   }
+  void set_was_alternate_protocol_available(bool value) {
+    was_alternate_protocol_available_ = value;
+  }
 
+  bool was_fetched_via_proxy() const { return was_fetched_via_proxy_; }
   void set_was_fetched_via_proxy(bool value) {
     was_fetched_via_proxy_ = value;
   }
-  bool was_fetched_via_proxy() const { return was_fetched_via_proxy_; }
 
   const GURL& searchable_form_url() const { return searchable_form_url_; }
   void set_searchable_form_url(const GURL& url) { searchable_form_url_ = url; }
@@ -238,6 +245,7 @@ class DocumentState : public WebKit::WebDataSource::ExtraData {
   int http_status_code_;
   bool was_fetched_via_spdy_;
   bool was_npn_negotiated_;
+  std::string npn_negotiated_protocol_;
   bool was_alternate_protocol_available_;
   bool was_fetched_via_proxy_;