| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/sessions/persistent_tab_restore_service.h" | 5 #include "chrome/browser/sessions/persistent_tab_restore_service.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 PersistentTabRestoreServiceTest() | 59 PersistentTabRestoreServiceTest() |
| 60 : url1_("http://1"), | 60 : url1_("http://1"), |
| 61 url2_("http://2"), | 61 url2_("http://2"), |
| 62 url3_("http://3"), | 62 url3_("http://3"), |
| 63 user_agent_override_( | 63 user_agent_override_( |
| 64 "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19" | 64 "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19" |
| 65 " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19"), | 65 " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19"), |
| 66 time_factory_(NULL) { | 66 time_factory_(NULL) { |
| 67 } | 67 } |
| 68 | 68 |
| 69 virtual ~PersistentTabRestoreServiceTest() { | 69 ~PersistentTabRestoreServiceTest() override {} |
| 70 } | |
| 71 | 70 |
| 72 protected: | 71 protected: |
| 73 enum { | 72 enum { |
| 74 kMaxEntries = TabRestoreServiceHelper::kMaxEntries, | 73 kMaxEntries = TabRestoreServiceHelper::kMaxEntries, |
| 75 }; | 74 }; |
| 76 | 75 |
| 77 // testing::Test: | 76 // testing::Test: |
| 78 virtual void SetUp() override { | 77 void SetUp() override { |
| 79 ChromeRenderViewHostTestHarness::SetUp(); | 78 ChromeRenderViewHostTestHarness::SetUp(); |
| 80 time_factory_ = new PersistentTabRestoreTimeFactory(); | 79 time_factory_ = new PersistentTabRestoreTimeFactory(); |
| 81 service_.reset(new PersistentTabRestoreService(profile(), time_factory_)); | 80 service_.reset(new PersistentTabRestoreService(profile(), time_factory_)); |
| 82 } | 81 } |
| 83 | 82 |
| 84 virtual void TearDown() override { | 83 void TearDown() override { |
| 85 service_->Shutdown(); | 84 service_->Shutdown(); |
| 86 service_.reset(); | 85 service_.reset(); |
| 87 delete time_factory_; | 86 delete time_factory_; |
| 88 ChromeRenderViewHostTestHarness::TearDown(); | 87 ChromeRenderViewHostTestHarness::TearDown(); |
| 89 } | 88 } |
| 90 | 89 |
| 91 TabRestoreService::Entries* mutable_entries() { | 90 TabRestoreService::Entries* mutable_entries() { |
| 92 return service_->mutable_entries(); | 91 return service_->mutable_entries(); |
| 93 } | 92 } |
| 94 | 93 |
| (...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 | 753 |
| 755 EXPECT_FALSE(service_->IsLoaded()); | 754 EXPECT_FALSE(service_->IsLoaded()); |
| 756 TestTabRestoreServiceObserver observer; | 755 TestTabRestoreServiceObserver observer; |
| 757 service_->AddObserver(&observer); | 756 service_->AddObserver(&observer); |
| 758 EXPECT_EQ(max_entries, service_->entries().size()); | 757 EXPECT_EQ(max_entries, service_->entries().size()); |
| 759 SynchronousLoadTabsFromLastSession(); | 758 SynchronousLoadTabsFromLastSession(); |
| 760 EXPECT_TRUE(observer.got_loaded()); | 759 EXPECT_TRUE(observer.got_loaded()); |
| 761 EXPECT_TRUE(service_->IsLoaded()); | 760 EXPECT_TRUE(service_->IsLoaded()); |
| 762 service_->RemoveObserver(&observer); | 761 service_->RemoveObserver(&observer); |
| 763 } | 762 } |
| OLD | NEW |