Remove the "snionly" concept from the HSTS preload.

chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc

 // 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.
 
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 65 matching lines @@
 };
 
 class SendingTestReporter : public TestReporter {
  public:
   explicit SendingTestReporter(net::URLRequestContext* request_context)
       : TestReporter(request_context), passed_(false) {}
 
   // Passes if invoked with a good SSLInfo and for a hostname that is a Google
   // pinned property.
   virtual void SendReport(const std::string& hostname,
-                          const SSLInfo& ssl_info,
-                          bool sni_available) OVERRIDE {
+                          const SSLInfo& ssl_info) OVERRIDE {
     EXPECT_TRUE(IsGoodSSLInfo(ssl_info));
-    EXPECT_TRUE(net::TransportSecurityState::IsGooglePinnedProperty(
-        hostname, sni_available));
+    EXPECT_TRUE(net::TransportSecurityState::IsGooglePinnedProperty(hostname));
     passed_ = true;
   }
 
   virtual ~SendingTestReporter() {
     // If the object is destroyed without having its SendReport method invoked,
     // we failed.
     EXPECT_TRUE(passed_);
   }
 
   bool passed_;
 };
 
 class NotSendingTestReporter : public TestReporter {
  public:
   explicit NotSendingTestReporter(net::URLRequestContext* request_context)
       : TestReporter(request_context) {}
 
   // Passes if invoked with a bad SSLInfo and for a hostname that is not a
   // Google pinned property.
   virtual void SendReport(const std::string& hostname,
-                          const SSLInfo& ssl_info,
-                          bool sni_available) OVERRIDE {
+                          const SSLInfo& ssl_info) OVERRIDE {
     EXPECT_FALSE(IsGoodSSLInfo(ssl_info));
-    EXPECT_FALSE(net::TransportSecurityState::IsGooglePinnedProperty(
-        hostname, sni_available));
+    EXPECT_FALSE(net::TransportSecurityState::IsGooglePinnedProperty(hostname));
   }
 };
 
 // A ChromeFraudulentCertificateReporter that uses a MockURLRequest, but is
 // otherwise normal: reports are constructed and sent in the usual way.
 class MockReporter : public ChromeFraudulentCertificateReporter {
  public:
   explicit MockReporter(net::URLRequestContext* request_context)
     : ChromeFraudulentCertificateReporter(request_context) {}
 
   virtual scoped_ptr<net::URLRequest> CreateURLRequest(
       net::URLRequestContext* context) OVERRIDE {
     return context->CreateRequest(GURL(std::string()),
                                   net::DEFAULT_PRIORITY,
                                   NULL,
                                   NULL);
   }
 
   virtual void SendReport(
       const std::string& hostname,
-      const net::SSLInfo& ssl_info,
-      bool sni_available) OVERRIDE {
+      const net::SSLInfo& ssl_info) OVERRIDE {
     DCHECK(!hostname.empty());
     DCHECK(ssl_info.is_valid());
-    ChromeFraudulentCertificateReporter::SendReport(hostname, ssl_info,
-                                                    sni_available);
+    ChromeFraudulentCertificateReporter::SendReport(hostname, ssl_info);
   }
 };
 
 static void DoReportIsSent() {
   net::TestURLRequestContext context;
   SendingTestReporter reporter(&context);
   SSLInfo info = GetGoodSSLInfo();
-  reporter.SendReport("mail.google.com", info, true);
+  reporter.SendReport("mail.google.com", info);
 }
 
 static void DoReportIsNotSent() {
   net::TestURLRequestContext context;
   NotSendingTestReporter reporter(&context);
   SSLInfo info = GetBadSSLInfo();
-  reporter.SendReport("www.example.com", info, true);
+  reporter.SendReport("www.example.com", info);
 }
 
 static void DoMockReportIsSent() {
   net::TestURLRequestContext context;
   MockReporter reporter(&context);
   SSLInfo info = GetGoodSSLInfo();
-  reporter.SendReport("mail.google.com", info, true);
+  reporter.SendReport("mail.google.com", info);
 }
 
 TEST(ChromeFraudulentCertificateReporterTest, GoodBadInfo) {
   SSLInfo good = GetGoodSSLInfo();
   EXPECT_TRUE(IsGoodSSLInfo(good));
 
   SSLInfo bad = GetBadSSLInfo();
   EXPECT_FALSE(IsGoodSSLInfo(bad));
 }
 
@@ skipping 12 matching lines @@
 }
 
 TEST(ChromeFraudulentCertificateReporterTest, ReportIsNotSent) {
   base::MessageLoopForIO loop;
   content::TestBrowserThread io_thread(BrowserThread::IO, &loop);
   loop.PostTask(FROM_HERE, base::Bind(&DoReportIsNotSent));
   loop.RunUntilIdle();
 }
 
 }  // namespace chrome_browser_net