Move code duplicated in two tests up into the TestingProfile.

chrome/browser/cocoa/cookies_window_controller_unittest.mm

-// 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/tree_model.h"
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cookies_window_controller.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ skipping 26 matching lines @@
 // create this hacky secondary getter.
 @interface CocoaCookieTreeNode (UglyHacks)
 - (NSMutableArray*)childs;
 @end
 @implementation CocoaCookieTreeNode (UglyHacks)
 - (NSMutableArray*)childs {
   return children_.get();
 }
 @end
 
-// Copied from src/chrome/cookies_tree_model_unittest.cc.
 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 CookiesWindowControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
+    TestingProfile* profile = browser_helper_.profile();
+    profile->CreateRequestContext();
     controller_.reset(
-        [[CookiesWindowController alloc] initWithProfile:&profile_]);
+        [[CookiesWindowController alloc] initWithProfile:profile]);
   }
 
   virtual void TearDown() {
     CocoaTest::TearDown();
   }
 
   CocoaCookieTreeNode* CocoaNodeFromTreeNode(TreeModelNode* node,
                                              bool recurse) {
     return [controller_ modelObserver]->CocoaNodeFromTreeNode(node, recurse);
   }
 
   CocoaCookieTreeNode* FindCocoaNode(TreeModelNode* node,
                                      CocoaCookieTreeNode* start) {
     return [controller_ modelObserver]->FindCocoaNode(node, start);
   }
 
-  CookieTestingProfile profile_;
+ protected:
+  BrowserTestHelper browser_helper_;
   scoped_nsobject<CookiesWindowController> controller_;
 };
 
 TEST_F(CookiesWindowControllerTest, Construction) {
   std::vector<SkBitmap> skia_icons;
   [controller_ treeModel]->GetIcons(&skia_icons);
 
   EXPECT_EQ([[controller_ icons] count], skia_icons.size() + 1U);
 }
 
@@ skipping 30 matching lines @@
       [[FakeCocoaCookieTreeNode alloc] initWithTreeNode:child1.get()]);
   scoped_nsobject<FakeCocoaCookieTreeNode> cocoaChild2(
       [[FakeCocoaCookieTreeNode alloc] initWithTreeNode:child2.get()]);
   [[cocoaParent childs] addObject:cocoaChild1.get()];
   [[cocoaChild1 childs] addObject:cocoaChild2.get()];
 
   EXPECT_EQ(cocoaChild2.get(), FindCocoaNode(child2.get(), cocoaParent.get()));
 }
 
 TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeCookie) {
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster();
   cm->SetCookie(GURL("http://foo.com"), "A=B");
-  CookiesTreeModel model(&profile_);
+  CookiesTreeModel model(browser_helper_.profile());
 
   // Root --> foo.com --> Cookies --> A. Create node for 'A'.
   TreeModelNode* node = model.GetRoot()->GetChild(0)->GetChild(0)->GetChild(0);
   CocoaCookieTreeNode* cookie = CocoaNodeFromTreeNode(node, false);
 
   EXPECT_TRUE([@"B" isEqualToString:[cookie content]]);
   EXPECT_TRUE([@"End of the session" isEqualToString:[cookie expires]]);
   EXPECT_TRUE([@"Any kind of connection" isEqualToString:[cookie sendFor]]);
   EXPECT_TRUE([@"A" isEqualToString:[cookie title]]);
   EXPECT_TRUE([@"A" isEqualToString:[cookie name]]);
   EXPECT_TRUE([@"/" isEqualToString:[cookie path]]);
   EXPECT_EQ(0U, [[cookie childs] count]);
   EXPECT_TRUE([cookie created]);
   EXPECT_TRUE([cookie isLeaf]);
   EXPECT_EQ(node, [cookie treeNode]);
 }
 
 TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeRecursive) {
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster();
   cm->SetCookie(GURL("http://foo.com"), "A=B");
-  CookiesTreeModel model(&profile_);
+  CookiesTreeModel model(browser_helper_.profile());
 
   // Root --> foo.com --> Cookies --> A. Create node for 'foo.com'.
   CookieTreeNode* node = model.GetRoot()->GetChild(0);
   CocoaCookieTreeNode* domain = CocoaNodeFromTreeNode(node, true);
   CocoaCookieTreeNode* cookies = [[domain childs] objectAtIndex:0];
   CocoaCookieTreeNode* cookie = [[cookies childs] objectAtIndex:0];
 
   // Test domain-level node.
   EXPECT_TRUE([@"foo.com" isEqualToString:[domain title]]);
 
@@ skipping 16 matching lines @@
   EXPECT_TRUE([@"/" isEqualToString:[cookie path]]);
   EXPECT_TRUE([@"foo.com" isEqualToString:[cookie domain]]);
   EXPECT_EQ(0U, [[cookie childs] count]);
   EXPECT_TRUE([cookie created]);
   EXPECT_TRUE([cookie isLeaf]);
   EXPECT_EQ(node->GetChild(0)->GetChild(0), [cookie treeNode]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodesAdded) {
   const GURL url = GURL("http://foo.com");
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  TestingProfile* profile = browser_helper_.profile();
+  net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
 
   controller_.reset(
-      [[CookiesWindowController alloc] initWithProfile:&profile_]);
+      [[CookiesWindowController alloc] initWithProfile:profile]);
 
   // Root --> foo.com --> Cookies.
   NSMutableArray* cocoa_children =
       [[[[[[controller_ cocoaTreeModel] childs] objectAtIndex:0]
           childs] objectAtIndex:0] childs];
   EXPECT_EQ(1U, [cocoa_children count]);
 
   // Create some cookies.
   cm->SetCookie(url, "C=D");
   cm->SetCookie(url, "E=F");
@@ skipping 13 matching lines @@
 
   // Manually notify the observer.
   [controller_ modelObserver]->TreeNodesAdded(model, parent, 1, 2);
 
   // Check that we have created 2 more Cocoa nodes.
   EXPECT_EQ(3U, [cocoa_children count]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodesRemoved) {
   const GURL url = GURL("http://foo.com");
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  TestingProfile* profile = browser_helper_.profile();
+  net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
   cm->SetCookie(url, "C=D");
   cm->SetCookie(url, "E=F");
 
   controller_.reset(
-      [[CookiesWindowController alloc] initWithProfile:&profile_]);
+      [[CookiesWindowController alloc] initWithProfile:profile]);
 
   // Root --> foo.com --> Cookies.
   NSMutableArray* cocoa_children =
       [[[[[[controller_ cocoaTreeModel] childs] objectAtIndex:0]
           childs] objectAtIndex:0] childs];
   EXPECT_EQ(3U, [cocoa_children count]);
 
   CookiesTreeModel* model = [controller_ treeModel];
   // Root --> foo.com --> Cookies.
   CookieTreeNode* parent = model->GetRoot()->GetChild(0)->GetChild(0);
 
   // Pretend to remove the nodes.
   [controller_ modelObserver]->TreeNodesRemoved(model, parent, 1, 2);
 
   EXPECT_EQ(1U, [cocoa_children count]);
 
   NSString* title = [[cocoa_children objectAtIndex:0] name];
   EXPECT_TRUE([@"A" isEqualToString:title]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodeChildrenReordered) {
   const GURL url = GURL("http://foo.com");
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  TestingProfile* profile = browser_helper_.profile();
+  net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
   cm->SetCookie(url, "C=D");
   cm->SetCookie(url, "E=F");
 
   controller_.reset(
-      [[CookiesWindowController alloc] initWithProfile:&profile_]);
+      [[CookiesWindowController alloc] initWithProfile:profile]);
 
   // Root --> foo.com --> Cookies.
   NSMutableArray* cocoa_children =
       [[[[[[controller_ cocoaTreeModel] childs] objectAtIndex:0]
           childs] objectAtIndex:0] childs];
   EXPECT_EQ(3U, [cocoa_children count]);
 
   // Check default ordering.
   CocoaCookieTreeNode* node = [cocoa_children objectAtIndex:0];
   EXPECT_TRUE([@"A" isEqualToString:[node name]]);
@@ skipping 19 matching lines @@
   node = [cocoa_children objectAtIndex:0];
   EXPECT_TRUE([@"E" isEqualToString:[node name]]);
   node =  [cocoa_children objectAtIndex:1];
   EXPECT_TRUE([@"A" isEqualToString:[node name]]);
   node =  [cocoa_children objectAtIndex:2];
   EXPECT_TRUE([@"C" isEqualToString:[node name]]);
 }
 
 TEST_F(CookiesWindowControllerTest, TreeNodeChanged) {
   const GURL url = GURL("http://foo.com");
-  net::CookieMonster* cm = profile_.GetCookieMonster();
+  TestingProfile* profile = browser_helper_.profile();
+  net::CookieMonster* cm = profile->GetCookieMonster();
   cm->SetCookie(url, "A=B");
 
   controller_.reset(
-      [[CookiesWindowController alloc] initWithProfile:&profile_]);
+      [[CookiesWindowController alloc] initWithProfile:profile]);
 
   CookiesTreeModel* model = [controller_ treeModel];
   // Root --> foo.com --> Cookies.
   CookieTreeNode* node = model->GetRoot()->GetChild(0)->GetChild(0);
 
   // Root --> foo.com --> Cookies.
   CocoaCookieTreeNode* cocoa_node =
       [[[[[controller_ cocoaTreeModel] childs] objectAtIndex:0]
           childs] objectAtIndex:0];
 
   EXPECT_TRUE([@"Cookies" isEqualToString:[cocoa_node title]]);
 
   // Fake update the cookie folder's title. This would never happen in reality,
   // but it tests the code path that ultimately calls CocoaNodeFromTreeNode,
   // which is tested elsewhere.
   node->SetTitle(L"Silly Change");
   [controller_ modelObserver]->TreeNodeChanged(model, node);
 
   EXPECT_TRUE([@"Silly Change" isEqualToString:[cocoa_node title]]);
 }
 
 }  // namespace