Merge 68816 - Fixes bug where we would show an instant preview when we though...

chrome/browser/instant/instant_loader_manager_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 "base/scoped_ptr.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/instant/instant_loader_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 12 matching lines @@
     return gfx::Rect();
   }
 
   virtual bool ShouldCommitInstantOnMouseUp() {
     return false;
   }
 
   virtual void CommitInstantLoader(InstantLoader* loader) {
   }
 
-  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader,
-                                                 bool needs_reload,
-                                                 const GURL& url_to_load) {
+  virtual void InstantLoaderDoesntSupportInstant(InstantLoader* loader) {
   }
 
   virtual void AddToBlacklist(InstantLoader* loader, const GURL& url) {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstantLoaderDelegateImpl);
 };
 
 }
@@ skipping 224 matching lines @@
   EXPECT_TRUE(manager.WillUpateChangeActiveLoader(1));
   ASSERT_TRUE(manager.active_loader());
   MarkReady(manager.active_loader());
 
   // Add a loader with id 1 and test again.
   manager.UpdateLoader(1, &loader);
   EXPECT_TRUE(manager.WillUpateChangeActiveLoader(0));
   EXPECT_FALSE(manager.WillUpateChangeActiveLoader(1));
 }