InstantExtended: update tests for Instant Extended (part 2).

chrome/browser/sessions/persistent_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 "chrome/browser/sessions/persistent_tab_restore_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 704 matching lines @@
 
   // Don't prune pinned NTPs.
   tab = new Tab();
   tab->pinned = true;
   tab->current_navigation_index = 0;
   tab->navigations.push_back(navigation);
   mutable_entries()->push_front(tab);
   EXPECT_EQ(max_entries + 1, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
-  EXPECT_TRUE(chrome::IsNTPURL(
-      static_cast<Tab*>(service_->entries().front())->
-          navigations[0].virtual_url(), profile()));
+  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();
   mutable_entries()->erase(mutable_entries()->begin());
   tab = new Tab();
   tab->current_navigation_index = 1;
   tab->navigations.push_back(navigation);
   tab->navigations.push_back(navigation);
   mutable_entries()->push_front(tab);
   EXPECT_EQ(max_entries, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
-  EXPECT_TRUE(chrome::IsNTPURL(
-      static_cast<Tab*>(service_->entries().front())->
-          navigations[1].virtual_url(), profile()));
+  EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
+            static_cast<Tab*>(service_->entries().front())->
+            navigations[1].virtual_url());
 }
 
 // Regression test for crbug.com/106082
 TEST_F(PersistentTabRestoreServiceTest, PruneIsCalled) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
@@ skipping 23 matching lines @@
 
   EXPECT_FALSE(service_->IsLoaded());
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
   EXPECT_EQ(max_entries, service_->entries().size());
   SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   EXPECT_TRUE(service_->IsLoaded());
   service_->RemoveObserver(&observer);
 }