Move creation of BrowserContext objects that live in content to content, instead of depending on th…

chrome/browser/cookies_tree_model_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/cookies_tree_model.h"
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ skipping 16 matching lines @@
 
 #include "base/utf_string_conversions.h"
 
 using ::testing::_;
 using content::BrowserThread;
 
 namespace {
 
 class CookiesTreeModelTest : public testing::Test {
  public:
-  CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_),
-                           io_thread_(BrowserThread::IO, &message_loop_) {
+  CookiesTreeModelTest()
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        file_user_blocking_(BrowserThread::FILE_USER_BLOCKING, &message_loop_),
+        io_thread_(BrowserThread::IO, &message_loop_) {
   }
 
   virtual ~CookiesTreeModelTest() {
+    // Avoid memory leaks.
+    profile_.reset();
+    message_loop_.RunAllPending();
   }
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     profile_->CreateRequestContext();
     mock_browsing_data_cookie_helper_ =
       new MockBrowsingDataCookieHelper(profile_.get());
     mock_browsing_data_database_helper_ =
       new MockBrowsingDataDatabaseHelper(profile_.get());
     mock_browsing_data_local_storage_helper_ =
@@ skipping 217 matching lines @@
   void DeleteStoredObjects(CookieTreeNode* node) {
     node->DeleteStoredObjects();
     CookieTreeNode* parent_node = node->parent();
     DCHECK(parent_node);
     delete parent_node->GetModel()->Remove(parent_node, node);
   }
 
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread file_user_blocking_;
   content::TestBrowserThread io_thread_;
 
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<MockBrowsingDataCookieHelper>
       mock_browsing_data_cookie_helper_;
   scoped_refptr<MockBrowsingDataDatabaseHelper>
       mock_browsing_data_database_helper_;
   scoped_refptr<MockBrowsingDataLocalStorageHelper>
       mock_browsing_data_local_storage_helper_;
   scoped_refptr<MockBrowsingDataLocalStorageHelper>
@@ skipping 709 matching lines @@
   cookies_model->UpdateSearchResults(std::wstring(L"fshost3"));
   EXPECT_EQ("http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 
   cookies_model->UpdateSearchResults(std::wstring());
   EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
             GetDisplayedFileSystems(cookies_model.get()));
 }
 
 }  // namespace