Revert 56522 - Fix leaks in GoogleURLTrackerTest::CreateRequestContext()...

chrome/browser/google_url_tracker_unittest.cc

 // Copyright (c) 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/google_url_tracker.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/net/url_fetcher.h"
@@ skipping 52 matching lines @@
                                          const GURL& new_google_url) {
     return new TestInfoBar(google_url_tracker, new_google_url);
   }
 };
 
 }  // anonymous namespace
 
 class GoogleURLTrackerTest : public testing::Test {
  protected:
   GoogleURLTrackerTest()
-      : message_loop_(MessageLoop::TYPE_IO),
-        io_thread_(ChromeThread::IO, &message_loop_),
-        original_default_request_context_(NULL) {
+      : original_default_request_context_(NULL) {
   }
 
   void SetUp() {
     original_default_request_context_ = Profile::GetDefaultRequestContext();
     Profile::set_default_request_context(NULL);
+    message_loop_ = new MessageLoop(MessageLoop::TYPE_IO);
     network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
     testing_profile_.reset(new TestingProfile);
     TestingBrowserProcess* testing_browser_process =
         static_cast<TestingBrowserProcess*>(g_browser_process);
     PrefService* pref_service = testing_profile_->GetPrefs();
     testing_browser_process->SetPrefService(pref_service);
     testing_browser_process->SetGoogleURLTracker(new GoogleURLTracker);
 
     URLFetcher::set_factory(&fetcher_factory_);
     observer_.reset(new TestNotificationObserver);
     g_browser_process->google_url_tracker()->infobar_factory_.reset(
         new TestInfoBarDelegateFactory);
   }
 
   void TearDown() {
     URLFetcher::set_factory(NULL);
     TestingBrowserProcess* testing_browser_process =
         static_cast<TestingBrowserProcess*>(g_browser_process);
     testing_browser_process->SetGoogleURLTracker(NULL);
     testing_browser_process->SetPrefService(NULL);
     testing_profile_.reset();
     network_change_notifier_.reset();
+    delete message_loop_;
     Profile::set_default_request_context(original_default_request_context_);
   }
 
   void CreateRequestContext() {
     testing_profile_->CreateRequestContext();
     Profile::set_default_request_context(testing_profile_->GetRequestContext());
     NotificationService::current()->Notify(
         NotificationType::DEFAULT_REQUEST_CONTEXT_AVAILABLE,
         NotificationService::AllSources(), NotificationService::NoDetails());
   }
@@ skipping 94 matching lines @@
     delete infobar;
   }
 
   void ExpectDefaultURLs() {
     EXPECT_EQ(GURL(GoogleURLTracker::kDefaultGoogleHomepage),
               GoogleURLTracker::GoogleURL());
     EXPECT_EQ(GURL(), GetFetchedGoogleURL());
   }
 
  private:
-  MessageLoop message_loop_;
-  ChromeThread io_thread_;
+  MessageLoop* message_loop_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<TestingProfile> testing_profile_;
 
   TestURLFetcherFactory fetcher_factory_;
   NotificationRegistrar registrar_;
   scoped_ptr<NotificationObserver> observer_;
 
   URLRequestContextGetter* original_default_request_context_;
 };
 
@@ skipping 215 matching lines @@
   EXPECT_EQ(GURL("http://www.google.co.uk/"), GetLastPromptedGoogleURL());
 
   SearchCommitted(GURL("http://www.google.co.uk/search?q=test"));
   NavEntryCommitted();
 
   EXPECT_FALSE(InfoBarIsShown());
   EXPECT_EQ(GURL("http://www.google.co.uk/"), GetFetchedGoogleURL());
   EXPECT_EQ(GURL("http://www.google.co.uk/"), GoogleURLTracker::GoogleURL());
   EXPECT_EQ(GURL("http://www.google.co.uk/"), GetLastPromptedGoogleURL());
 }