Give mojo_shell a TransportSecurityPersister

net/http/transport_security_persister_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/transport_security_persister.h"
+#include "net/http/transport_security_persister.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "net/http/transport_security_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using net::TransportSecurityPersister;
 using net::TransportSecurityState;
 
 class TransportSecurityPersisterTest : public testing::Test {
  public:
-  TransportSecurityPersisterTest()
-      : message_loop_(base::MessageLoop::TYPE_IO) {
+  TransportSecurityPersisterTest() {
   }
 
   virtual ~TransportSecurityPersisterTest() {
-    message_loop_.RunUntilIdle();
+    base::MessageLoopForIO::current()->RunUntilIdle();
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     persister_.reset(new TransportSecurityPersister(
-        &state_, temp_dir_.path(), message_loop_.message_loop_proxy(), false));
+        &state_,
+        temp_dir_.path(),
+        base::MessageLoopForIO::current()->message_loop_proxy(),
+        false));
   }
 
  protected:
-  // Ordering is important here. If member variables are not destroyed in the
-  // right order, then DCHECKs will fail all over the place.
-  base::MessageLoop message_loop_;
-
   base::ScopedTempDir temp_dir_;
   TransportSecurityState state_;
   scoped_ptr<TransportSecurityPersister> persister_;
 };
 
 TEST_F(TransportSecurityPersisterTest, SerializeData1) {
   std::string output;
   bool dirty;
 
   EXPECT_TRUE(persister_->SerializeData(&output));
@@ skipping 142 matching lines @@
   std::string ser;
   EXPECT_TRUE(persister_->SerializeData(&ser));
   bool dirty;
   EXPECT_TRUE(persister_->LoadEntries(ser, &dirty));
   EXPECT_TRUE(state_.GetDomainState(kTestDomain, false, &domain_state));
   EXPECT_EQ(1u, domain_state.dynamic_spki_hashes.size());
   EXPECT_EQ(sha1.tag, domain_state.dynamic_spki_hashes[0].tag);
   EXPECT_EQ(0, memcmp(domain_state.dynamic_spki_hashes[0].data(), sha1.data(),
                       sha1.size()));
 }