Valgrind: Fix leak in TabRestoreServiceTest.PruneEntries.

chrome/browser/sessions/tab_restore_service_browsertest.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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ skipping 98 matching lines @@
         SessionServiceFactory::GetForProfile(profile());
     SessionID tab_id;
     SessionID window_id;
     session_service->SetWindowType(
         window_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
     session_service->SetTabWindow(window_id, tab_id);
     session_service->SetTabIndexInWindow(window_id, tab_id, 0);
     session_service->SetSelectedTabInWindow(window_id, 0);
     if (pinned)
       session_service->SetPinnedState(window_id, tab_id, true);
-    scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());;
+    scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
     entry->SetURL(url1_);
     session_service->UpdateTabNavigation(window_id, tab_id, 0, *entry.get());
   }
 
   // Creates a SessionService and assigns it to the Profile. The SessionService
   // is configured with a single window with a single tab pointing at url1_ by
   // way of AddWindowWithOneTabToSessionService. If |pinned| is true, the
   // tab is marked as pinned in the session service.
   void CreateSessionServiceWithOneWindow(bool pinned) {
     // The profile takes ownership of this.
@@ skipping 152 matching lines @@
 
   // One entry should be created.
   ASSERT_EQ(1U, trs->entries().size());
   const TabRestoreService::Entry* restored_entry = trs->entries().front();
 
   // It should be a window with an app.
   ASSERT_EQ(TabRestoreService::WINDOW, restored_entry->type);
   const Window* restored_window =
       static_cast<const Window*>(restored_entry);
   EXPECT_EQ(app_name, restored_window->app_name);
-
 }
-#endif
+#endif  // defined(USE_AURA)
 
 // Make sure we persist entries to disk that have post data.
 TEST_F(TabRestoreServiceTest, DontPersistPostData) {
   AddThreeNavigations();
   controller().GetEntryAtIndex(0)->SetHasPostData(true);
   controller().GetEntryAtIndex(1)->SetHasPostData(true);
   controller().GetEntryAtIndex(2)->SetHasPostData(true);
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(contents(), -1);
@@ skipping 261 matching lines @@
   // Only keep kMaxEntries around.
   EXPECT_EQ(max_entries + 5, service_->entries_.size());
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
   // Pruning again does nothing.
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
 
   // Prune older first.
   TabNavigation navigation;
-  navigation.set_virtual_url(GURL("http://recent"));
+  const char kRecentUrl[] = "http://recent";
+  navigation.set_virtual_url(GURL(kRecentUrl));
   navigation.set_title(ASCIIToUTF16("Most recent"));
   Tab* tab = new Tab();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
   service_->entries_.push_front(tab);
   EXPECT_EQ(max_entries + 1, service_->entries_.size());
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
-  EXPECT_EQ(GURL("http://recent"),
+  EXPECT_EQ(GURL(kRecentUrl),
       static_cast<Tab*>(service_->entries_.front())->
           navigations[0].virtual_url());
 
   // Ignore NTPs.
   navigation.set_virtual_url(GURL(chrome::kChromeUINewTabURL));
   navigation.set_title(ASCIIToUTF16("New tab"));
 
   tab = new Tab();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
   service_->entries_.push_front(tab);
 
   EXPECT_EQ(max_entries + 1, service_->entries_.size());
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
-  EXPECT_EQ(GURL("http://recent"),
+  EXPECT_EQ(GURL(kRecentUrl),
       static_cast<Tab*>(service_->entries_.front())->
           navigations[0].virtual_url());
 
   // Don't prune pinned NTPs.
   tab = new Tab();
   tab->pinned = true;
   tab->current_navigation_index = 0;
   tab->navigations.push_back(navigation);
   service_->entries_.push_front(tab);
   EXPECT_EQ(max_entries + 1, service_->entries_.size());
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
       static_cast<Tab*>(service_->entries_.front())->
           navigations[0].virtual_url());
 
   // Don't prune NTPs that have multiple navigations.
   // (Erase the last NTP first.)
+  delete service_->entries_.front();
   service_->entries_.erase(service_->entries_.begin());
   tab = new Tab();
   tab->current_navigation_index = 1;
   tab->navigations.push_back(navigation);
   tab->navigations.push_back(navigation);
   service_->entries_.push_front(tab);
   EXPECT_EQ(max_entries, service_->entries_.size());
   service_->PruneEntries();
   EXPECT_EQ(max_entries, service_->entries_.size());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
@@ skipping 14 matching lines @@
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(contents(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries_.size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries_.size());
 }