| Index: chrome/browser/io_thread_unittest.cc
|
| diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
|
| index 6b48101b41de864670752659f8c1b2d6d7bcfa2c..a88d6f52299897353a2608545cac008058e7aa06 100644
|
| --- a/chrome/browser/io_thread_unittest.cc
|
| +++ b/chrome/browser/io_thread_unittest.cc
|
| @@ -97,25 +97,25 @@ TEST_F(IOThreadTest, SpdyFieldTrialHoldbackEnabled) {
|
| }
|
|
|
| TEST_F(IOThreadTest, SpdyFieldTrialSpdy31Enabled) {
|
| - bool use_alternate_protocols = false;
|
| + bool use_alternative_services = false;
|
| field_trial_group_ = "Spdy31Enabled";
|
| ConfigureSpdyGlobals();
|
| EXPECT_THAT(globals_.next_protos,
|
| ElementsAre(net::kProtoHTTP11,
|
| net::kProtoSPDY31));
|
| - globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
|
| - EXPECT_TRUE(use_alternate_protocols);
|
| + globals_.use_alternative_services.CopyToIfSet(&use_alternative_services);
|
| + EXPECT_TRUE(use_alternative_services);
|
| }
|
|
|
| TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) {
|
| - bool use_alternate_protocols = false;
|
| + bool use_alternative_services = false;
|
| field_trial_group_ = "Spdy4Enabled";
|
| ConfigureSpdyGlobals();
|
| EXPECT_THAT(globals_.next_protos,
|
| ElementsAre(net::kProtoHTTP11, net::kProtoSPDY31,
|
| net::kProtoHTTP2_14, net::kProtoHTTP2));
|
| - globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
|
| - EXPECT_TRUE(use_alternate_protocols);
|
| + globals_.use_alternative_services.CopyToIfSet(&use_alternative_services);
|
| + EXPECT_TRUE(use_alternative_services);
|
| }
|
|
|
| TEST_F(IOThreadTest, SpdyFieldTrialDefault) {
|
| @@ -124,9 +124,9 @@ TEST_F(IOThreadTest, SpdyFieldTrialDefault) {
|
| EXPECT_THAT(globals_.next_protos,
|
| ElementsAre(net::kProtoHTTP11, net::kProtoSPDY31,
|
| net::kProtoHTTP2_14, net::kProtoHTTP2));
|
| - bool use_alternate_protocols = false;
|
| - globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
|
| - EXPECT_TRUE(use_alternate_protocols);
|
| + bool use_alternative_services = false;
|
| + globals_.use_alternative_services.CopyToIfSet(&use_alternative_services);
|
| + EXPECT_TRUE(use_alternative_services);
|
| }
|
|
|
| TEST_F(IOThreadTest, SpdyFieldTrialParametrized) {
|
| @@ -137,9 +137,9 @@ TEST_F(IOThreadTest, SpdyFieldTrialParametrized) {
|
| ConfigureSpdyGlobals();
|
| EXPECT_THAT(globals_.next_protos,
|
| ElementsAre(net::kProtoHTTP11, net::kProtoHTTP2));
|
| - bool use_alternate_protocols = false;
|
| - globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
|
| - EXPECT_TRUE(use_alternate_protocols);
|
| + bool use_alternative_services = false;
|
| + globals_.use_alternative_services.CopyToIfSet(&use_alternative_services);
|
| + EXPECT_TRUE(use_alternative_services);
|
| }
|
|
|
| TEST_F(IOThreadTest, SpdyCommandLineUseSpdyOff) {
|
| @@ -153,9 +153,9 @@ TEST_F(IOThreadTest, SpdyCommandLineUseSpdyOff) {
|
| TEST_F(IOThreadTest, SpdyCommandLineUseSpdyDisableAltProtocols) {
|
| command_line_.AppendSwitchASCII("use-spdy", "no-alt-protocols");
|
| ConfigureSpdyGlobals();
|
| - bool use_alternate_protocols = true;
|
| - globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
|
| - EXPECT_FALSE(use_alternate_protocols);
|
| + bool use_alternative_services = true;
|
| + globals_.use_alternative_services.CopyToIfSet(&use_alternative_services);
|
| + EXPECT_FALSE(use_alternative_services);
|
| }
|
|
|
| TEST_F(IOThreadTest, DisableQuicByDefault) {
|
|
|