Move code duplicated in two tests up into the TestingProfile.

chrome/browser/cookies_tree_model_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009-2010 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/cookies_tree_model.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/test/testing_profile.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace {
 
-class TestURLRequestContext : public URLRequestContext {
- public:
-  TestURLRequestContext() {
-    cookie_store_ = new net::CookieMonster();
-  }
-};
-
-class TestURLRequestContextGetter : public URLRequestContextGetter {
- public:
-  virtual URLRequestContext* GetURLRequestContext() {
-    if (!context_)
-      context_ = new TestURLRequestContext();
-    return context_.get();
-  }
- private:
-  scoped_refptr<URLRequestContext> context_;
-};
-
-class CookieTestingProfile : public TestingProfile {
- public:
-  virtual URLRequestContextGetter* GetRequestContext() {
-    if (!url_request_context_getter_.get())
-      url_request_context_getter_ = new TestURLRequestContextGetter;
-    return url_request_context_getter_.get();
-  }
-  virtual ~CookieTestingProfile() {}
-
-  net::CookieMonster* GetCookieMonster() {
-    return GetRequestContext()->GetCookieStore()->GetCookieMonster();
-  }
-
- private:
-  scoped_refptr<URLRequestContextGetter> url_request_context_getter_;
-};
-
 class CookiesTreeModelTest : public testing::Test {
  public:
   CookiesTreeModelTest() : io_thread_(ChromeThread::IO, &message_loop_) {
   }
 
   virtual ~CookiesTreeModelTest() {
   }
 
   virtual void SetUp() {
-    profile_.reset(new CookieTestingProfile());
+    profile_.reset(new TestingProfile());
+    profile_->CreateRequestContext();
   }
 
   // Get the cookie names in the cookie list, as a comma seperated string.
   // (Note that the CookieMonster cookie list is sorted by domain.)
   // Ex:
   //   monster->SetCookie(GURL("http://b"), "X=1")
   //   monster->SetCookie(GURL("http://a"), "Y=1")
   //   EXPECT_STREQ("Y,X", GetMonsterCookies(monster).c_str());
   std::string GetMonsterCookies(net::CookieMonster* monster) {
     std::vector<std::string> parts;
@@ skipping 36 matching lines @@
     // find the parent and index
     CookieTreeNode* parent_node = node->GetParent();
     DCHECK(parent_node);
     int ct_node_index = parent_node->IndexOfChild(node);
     delete parent_node->GetModel()->Remove(parent_node, ct_node_index);
   }
  protected:
   MessageLoop message_loop_;
   ChromeThread io_thread_;
 
-  scoped_ptr<CookieTestingProfile> profile_;
+  scoped_ptr<TestingProfile> profile_;
 };
 
 TEST_F(CookiesTreeModelTest, RemoveAll) {
   net::CookieMonster* monster = profile_->GetCookieMonster();
   monster->SetCookie(GURL("http://foo"), "A=1");
   monster->SetCookie(GURL("http://foo2"), "B=1");
   CookiesTreeModel cookies_model(profile_.get());
 
   // Reset the selection of the first row.
   {
@@ skipping 187 matching lines @@
   {
     SCOPED_TRACE("Second origin removed");
     EXPECT_STREQ("D,A,C,F,B,G,H", GetMonsterCookies(monster).c_str());
     EXPECT_STREQ("F,C,B,A,G,D,H", GetDisplayedCookies(&cookies_model).c_str());
   }
 }
 
 
 
 }  // namespace