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/stringprintf.h" | 5 #include "base/stringprintf.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/sessions/session_types.h" | 7 #include "chrome/browser/sessions/session_types.h" |
8 #include "chrome/browser/sessions/session_service.h" | 8 #include "chrome/browser/sessions/session_service.h" |
9 #include "chrome/browser/sessions/session_service_factory.h" | 9 #include "chrome/browser/sessions/session_service_factory.h" |
10 #include "chrome/browser/sessions/tab_restore_service.h" | 10 #include "chrome/browser/sessions/tab_restore_service.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 url2_ = GURL("http://2"); | 44 url2_ = GURL("http://2"); |
45 url3_ = GURL("http://3"); | 45 url3_ = GURL("http://3"); |
46 } | 46 } |
47 | 47 |
48 ~TabRestoreServiceTest() { | 48 ~TabRestoreServiceTest() { |
49 } | 49 } |
50 | 50 |
51 protected: | 51 protected: |
52 // testing::Test overrides | 52 // testing::Test overrides |
53 virtual void SetUp() { | 53 virtual void SetUp() { |
| 54 WebKit::initialize(&webkit_platform_support_); |
54 ChromeRenderViewHostTestHarness::SetUp(); | 55 ChromeRenderViewHostTestHarness::SetUp(); |
55 time_factory_ = new TabRestoreTimeFactory(); | 56 time_factory_ = new TabRestoreTimeFactory(); |
56 service_.reset(new TabRestoreService(profile(), time_factory_)); | 57 service_.reset(new TabRestoreService(profile(), time_factory_)); |
57 WebKit::initialize(&webkit_platform_support_); | |
58 } | 58 } |
59 | 59 |
60 virtual void TearDown() { | 60 virtual void TearDown() { |
61 service_.reset(); | 61 service_.reset(); |
62 delete time_factory_; | 62 delete time_factory_; |
63 ChromeRenderViewHostTestHarness::TearDown(); | 63 ChromeRenderViewHostTestHarness::TearDown(); |
64 WebKit::shutdown(); | 64 WebKit::shutdown(); |
65 } | 65 } |
66 | 66 |
67 void AddThreeNavigations() { | 67 void AddThreeNavigations() { |
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
630 for (size_t i = 0; i < max_entries + 5; i++) { | 630 for (size_t i = 0; i < max_entries + 5; i++) { |
631 NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i)))); | 631 NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i)))); |
632 service_->CreateHistoricalTab(&controller(), -1); | 632 service_->CreateHistoricalTab(&controller(), -1); |
633 } | 633 } |
634 | 634 |
635 EXPECT_EQ(max_entries, service_->entries_.size()); | 635 EXPECT_EQ(max_entries, service_->entries_.size()); |
636 // This should not crash. | 636 // This should not crash. |
637 service_->LoadTabsFromLastSession(); | 637 service_->LoadTabsFromLastSession(); |
638 EXPECT_EQ(max_entries, service_->entries_.size()); | 638 EXPECT_EQ(max_entries, service_->entries_.size()); |
639 } | 639 } |
OLD | NEW |