Change infobar creation to use a public static Create() method on the infobar delegate classes.

chrome/browser/google/google_url_tracker_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/google/google_url_tracker.h"
 
 #include <set>
 #include <string>
 
 #include "base/message_loop.h"
@@ skipping 13 matching lines @@
 
 class GoogleURLTrackerTest;
 
 
 namespace {
 
 // TestInfoBarDelegate --------------------------------------------------------
 
 class TestInfoBarDelegate : public GoogleURLTrackerInfoBarDelegate {
  public:
+  // Creates a test delegate and returns it.  Unlike the parent class, this does
+  // not create add the infobar to |infobar_service|, since that "pointer" is
+  // really just a magic number.  Thus there is no InfoBarService ownership of
+  // the returned object; and since the caller doesn't own the returned object,
+  // we rely on |test_harness| cleaning this up eventually in
+  // GoogleURLTrackerTest::OnInfoBarClosed() to avoid leaks.
+  static GoogleURLTrackerInfoBarDelegate* Create(
+      GoogleURLTrackerTest* test_harness,
+      InfoBarService* infobar_service,
+      GoogleURLTracker* google_url_tracker,
+      const GURL& search_url);
+
+ private:
   TestInfoBarDelegate(GoogleURLTrackerTest* test_harness,
                       InfoBarService* infobar_service,
                       GoogleURLTracker* google_url_tracker,
                       const GURL& search_url);
   virtual ~TestInfoBarDelegate();
 
- private:
   // GoogleURLTrackerInfoBarDelegate:
   virtual void Update(const GURL& search_url) OVERRIDE;
   virtual void Close(bool redo_search) OVERRIDE;
 
   GoogleURLTrackerTest* test_harness_;
   InfoBarService* infobar_service_;
 
   DISALLOW_COPY_AND_ASSIGN(TestInfoBarDelegate);
 };
 
@@ skipping 48 matching lines @@
 // make everything continue to work.
 //
 // Technically, the C++98 spec defines the result of casting
 // T* -> intptr_t -> T* to be an identity, but intptr_t -> T* -> intptr_t (what
 // we use here) is "implementation-defined".  Since I've never seen a compiler
 // break this, though, and the result would simply be a failing test rather than
 // a bug in Chrome, we'll use it anyway.
 class GoogleURLTrackerTest : public testing::Test {
  public:
   // Called by TestInfoBarDelegate::Close().
-  void OnInfoBarClosed(GoogleURLTrackerInfoBarDelegate* infobar,
+  void OnInfoBarClosed(InfoBarDelegate* infobar,
                        InfoBarService* infobar_service);
 
  protected:
   GoogleURLTrackerTest();
   virtual ~GoogleURLTrackerTest();
 
   // testing::Test
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
@@ skipping 43 matching lines @@
   net::TestURLFetcherFactory fetcher_factory_;
   content::NotificationRegistrar registrar_;
   TestNotificationObserver observer_;
   TestingProfile profile_;
   scoped_ptr<GoogleURLTracker> google_url_tracker_;
   // This tracks the different "tabs" a test has "opened", so we can close them
   // properly before shutting down |google_url_tracker_|, which expects that.
   std::set<int> unique_ids_seen_;
 };
 
-void GoogleURLTrackerTest::OnInfoBarClosed(
-    GoogleURLTrackerInfoBarDelegate* infobar,
-    InfoBarService* infobar_service) {
+void GoogleURLTrackerTest::OnInfoBarClosed(InfoBarDelegate* infobar,
+                                           InfoBarService* infobar_service) {
   // First, simulate the InfoBarService firing INFOBAR_REMOVED.
   InfoBarRemovedDetails removed_details(infobar, false);
   GoogleURLTracker::EntryMap::const_iterator i =
       google_url_tracker_->entry_map_.find(infobar_service);
   ASSERT_FALSE(i == google_url_tracker_->entry_map_.end());
   GoogleURLTrackerMapEntry* map_entry = i->second;
   ASSERT_EQ(infobar, map_entry->infobar());
   map_entry->Observe(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                      content::Source<InfoBarService>(infobar_service),
                      content::Details<InfoBarRemovedDetails>(&removed_details));
 
   // Second, simulate the infobar container closing the infobar in response.
-  infobar->InfoBarClosed();
+  delete infobar;
 }
 
 GoogleURLTrackerTest::GoogleURLTrackerTest()
     : message_loop_(MessageLoop::TYPE_IO),
       io_thread_(content::BrowserThread::IO, &message_loop_) {
   GoogleURLTrackerFactory::GetInstance()->RegisterUserPrefsOnProfile(&profile_);
 }
 
 GoogleURLTrackerTest::~GoogleURLTrackerTest() {
 }
@@ skipping 180 matching lines @@
         map_entry->navigation_controller_source()));
   } else {
     EXPECT_FALSE(listening);
   }
 }
 
 GoogleURLTrackerInfoBarDelegate* GoogleURLTrackerTest::CreateTestInfoBar(
     InfoBarService* infobar_service,
     GoogleURLTracker* google_url_tracker,
     const GURL& search_url) {
-  return new TestInfoBarDelegate(this, infobar_service, google_url_tracker,
-                                 search_url);
+  return TestInfoBarDelegate::Create(this, infobar_service, google_url_tracker,
+                                     search_url);
 }
 
 
 // TestInfoBarDelegate --------------------------------------------------------
 
 namespace {
 
+// static
+GoogleURLTrackerInfoBarDelegate* TestInfoBarDelegate::Create(
+    GoogleURLTrackerTest* test_harness,
+    InfoBarService* infobar_service,
+    GoogleURLTracker* google_url_tracker,
+    const GURL& search_url) {
+  return new TestInfoBarDelegate(test_harness, infobar_service,
+                                 google_url_tracker, search_url);
+}
+
 TestInfoBarDelegate::TestInfoBarDelegate(GoogleURLTrackerTest* test_harness,
                                          InfoBarService* infobar_service,
                                          GoogleURLTracker* google_url_tracker,
                                          const GURL& search_url)
   : GoogleURLTrackerInfoBarDelegate(NULL, google_url_tracker, search_url),
     test_harness_(test_harness),
     infobar_service_(infobar_service) {
 }
 
 TestInfoBarDelegate::~TestInfoBarDelegate() {
@@ skipping 621 matching lines @@
   CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2"));
   EXPECT_FALSE(GetInfoBar(1) == NULL);
   GoogleURLTrackerInfoBarDelegate* infobar2 = GetInfoBar(2);
   ASSERT_FALSE(infobar2 == NULL);
   SetNavigationPending(1, true);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true));
   infobar2->Close(false);
   SetNavigationPending(1, false);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false));
 }