Fix memory leak in OneClickSigninHelperTest.

chrome/browser/ui/sync/one_click_signin_helper_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 "base/message_loop.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_manager_fake.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 43 matching lines @@
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<TestingProfile> profile_;
   SigninManager* signin_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelperTest);
 };
 
 void OneClickSigninHelperTest::TearDown() {
   // Destroy things in proper order.
   web_contents_.reset();
+
+  // Flush messages related web contents destruction before destroying the

[Derek Bruening, 2012/06/01 15:04:24]

nit: grammar

+  // browser context.
+  MessageLoop::current()->RunAllPending();
   profile_.reset();
+
   ui_thread_.reset();
 }
 
 void OneClickSigninHelperTest::MarkCurrentThreadAsUIThread() {
   ui_thread_.reset(new content::TestBrowserThread(
       content::BrowserThread::UI, &message_loop_));
 }
 
 content::WebContents* OneClickSigninHelperTest::CreateMockWebContents(
     bool use_incognito) {
@@ skipping 60 matching lines @@
 TEST_F(OneClickSigninHelperTest, CanOfferIncognito) {
   MarkCurrentThreadAsUIThread();
   content::WebContents* web_contents = CreateMockWebContents(true);
 
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, false));
 }
 
 TEST_F(OneClickSigninHelperTest, CanOfferNoSigninCookies) {
   MarkCurrentThreadAsUIThread();
-  content::WebContents* web_contents = CreateMockWebContents(true);
+  content::WebContents* web_contents = CreateMockWebContents(false);
   AllowSigninCookies(false);
 
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, true));
   EXPECT_FALSE(OneClickSigninHelper::CanOffer(web_contents, false));
 }