OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "chrome/browser/instant/instant_loader.h" | 6 #include "chrome/browser/instant/instant_loader.h" |
7 #include "chrome/browser/instant/instant_loader_delegate.h" | 7 #include "chrome/browser/instant/instant_loader_delegate.h" |
8 #include "chrome/browser/instant/instant_loader_manager.h" | 8 #include "chrome/browser/instant/instant_loader_manager.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 21 matching lines...) Expand all Loading... |
32 } | 32 } |
33 | 33 |
34 virtual void InstantLoaderDoesntSupportInstant( | 34 virtual void InstantLoaderDoesntSupportInstant( |
35 InstantLoader* loader) OVERRIDE { | 35 InstantLoader* loader) OVERRIDE { |
36 } | 36 } |
37 | 37 |
38 virtual void AddToBlacklist(InstantLoader* loader, | 38 virtual void AddToBlacklist(InstantLoader* loader, |
39 const GURL& url) OVERRIDE { | 39 const GURL& url) OVERRIDE { |
40 } | 40 } |
41 | 41 |
| 42 virtual void SwappedTabContents(InstantLoader* loader) OVERRIDE { |
| 43 } |
| 44 |
42 private: | 45 private: |
43 DISALLOW_COPY_AND_ASSIGN(InstantLoaderDelegateImpl); | 46 DISALLOW_COPY_AND_ASSIGN(InstantLoaderDelegateImpl); |
44 }; | 47 }; |
45 | 48 |
46 } | 49 } |
47 | 50 |
48 class InstantLoaderManagerTest : public testing::Test { | 51 class InstantLoaderManagerTest : public testing::Test { |
49 public: | 52 public: |
50 InstantLoaderManagerTest() {} | 53 InstantLoaderManagerTest() {} |
51 | 54 |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 InstantLoader* non_instant_loader = manager.active_loader(); | 302 InstantLoader* non_instant_loader = manager.active_loader(); |
300 ASSERT_TRUE(non_instant_loader); | 303 ASSERT_TRUE(non_instant_loader); |
301 ASSERT_NE(instant_loader, non_instant_loader); | 304 ASSERT_NE(instant_loader, non_instant_loader); |
302 MarkReady(non_instant_loader); | 305 MarkReady(non_instant_loader); |
303 | 306 |
304 // This makes the non_instant_loader the current loader since it was ready. | 307 // This makes the non_instant_loader the current loader since it was ready. |
305 scoped_ptr<InstantLoader> loader; | 308 scoped_ptr<InstantLoader> loader; |
306 manager.UpdateLoader(0, &loader); | 309 manager.UpdateLoader(0, &loader); |
307 ASSERT_NE(loader.get(), non_instant_loader); | 310 ASSERT_NE(loader.get(), non_instant_loader); |
308 } | 311 } |
OLD | NEW |