Merge 83199 - Fix https://m.gmail.com/ and https://m.googlemail.com/, which don't return a

net/base/transport_security_state_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "net/base/transport_security_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 class TransportSecurityStateTest : public testing::Test {
@@ skipping 479 matching lines @@
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
                                       "accounts.google.com",
                                       true));
 
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "entropia.de", true));
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "www.entropia.de", true));
   EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "foo.entropia.de", true));
 
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "gmail.com", true));
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "www.gmail.com", true));
+  EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "m.gmail.com", true));
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "googlemail.com", true));
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
                                       "www.googlemail.com",
                                       true));
+  EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+                                       "m.googlemail.com",
+                                       true));
   EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "gmail.com", false));
   EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "www.gmail.com", false));
+  EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "m.gmail.com", false));
   EXPECT_FALSE(state->IsEnabledForHost(&domain_state, "googlemail.com", false));
   EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
-                                      "www.googlemail.com",
-                                      false));
+                                       "www.googlemail.com",
+                                       false));
+  EXPECT_FALSE(state->IsEnabledForHost(&domain_state,
+                                       "m.googlemail.com",
+                                       false));
 }
 
 TEST_F(TransportSecurityStateTest, LongNames) {
   scoped_refptr<TransportSecurityState> state(
       new TransportSecurityState);
   const char kLongName[] =
       "lookupByWaveIdHashAndWaveIdIdAndWaveIdDomainAndWaveletIdIdAnd"
       "WaveletIdDomainAndBlipBlipid";
   TransportSecurityState::DomainState domain_state;
   // Just checks that we don't hit a NOTREACHED.
@@ skipping 27 matching lines @@
   EXPECT_TRUE(state->Serialise(&ser));
   bool dirty;
   EXPECT_TRUE(state->LoadEntries(ser, &dirty));
   EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "example.com", false));
   EXPECT_EQ(1u, domain_state.public_key_hashes.size());
   EXPECT_TRUE(0 == memcmp(domain_state.public_key_hashes[0].data, hash.data,
                           sizeof(hash.data)));
 }
 
 }  // namespace net