Merge internal change: 63891842 - QuicServerId changes

net/http/disk_cache_based_quic_server_info.h

 // Copyright 2014 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.
 
 #ifndef NET_HTTP_DISK_CACHE_BASED_QUIC_SERVER_INFO_H_
 #define NET_HTTP_DISK_CACHE_BASED_QUIC_SERVER_INFO_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/quic/crypto/quic_server_info.h"
 
 namespace net {
 
 class HttpCache;
 class IOBuffer;
-class QuicSessionKey;
+class QuicServerId;
 
 // DiskCacheBasedQuicServerInfo fetches information about a QUIC server from
 // our standard disk cache. Since the information is defined to be
 // non-sensitive, it's ok for us to keep it on disk.
 class NET_EXPORT_PRIVATE DiskCacheBasedQuicServerInfo
     : public QuicServerInfo,
       public NON_EXPORTED_BASE(base::NonThreadSafe) {
  public:
-  DiskCacheBasedQuicServerInfo(const QuicSessionKey& server_key,
+  DiskCacheBasedQuicServerInfo(const QuicServerId& server_id,
                                HttpCache* http_cache);
 
   // QuicServerInfo implementation.
   virtual void Start() OVERRIDE;
   virtual int WaitForDataReady(const CompletionCallback& callback) OVERRIDE;
   virtual bool IsDataReady() OVERRIDE;
   virtual bool IsReadyToPersist() OVERRIDE;
   virtual void Persist() OVERRIDE;
 
  private:
@@ skipping 43 matching lines @@
   // DoSetDone is the terminal state of the write operation.
   int DoSetDone();
 
   base::WeakPtrFactory<DiskCacheBasedQuicServerInfo> weak_factory_;
   CacheOperationDataShim* data_shim_;  // Owned by |io_callback_|.
   CompletionCallback io_callback_;
   State state_;
   bool ready_;
   bool found_entry_;  // Controls the behavior of DoCreateOrOpen.
   std::string new_data_;
-  const QuicSessionKey server_key_;
+  const QuicServerId server_id_;
   HttpCache* const http_cache_;
   disk_cache::Backend* backend_;
   disk_cache::Entry* entry_;
   CompletionCallback user_callback_;
   scoped_refptr<IOBuffer> read_buffer_;
   scoped_refptr<IOBuffer> write_buffer_;
   std::string data_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_DISK_CACHE_BASED_QUIC_SERVER_INFO_H_