| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "chrome/browser/sessions/session_types.h" | 10 #include "chrome/browser/sessions/session_types.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 MOCK_CONST_METHOD0(GetEntryCount, int()); | 183 MOCK_CONST_METHOD0(GetEntryCount, int()); |
| 184 MOCK_CONST_METHOD0(GetPendingEntryIndex, int()); | 184 MOCK_CONST_METHOD0(GetPendingEntryIndex, int()); |
| 185 MOCK_CONST_METHOD0(GetPendingEntry, content::NavigationEntry*()); | 185 MOCK_CONST_METHOD0(GetPendingEntry, content::NavigationEntry*()); |
| 186 MOCK_CONST_METHOD1(GetEntryAtIndex, content::NavigationEntry*(int i)); | 186 MOCK_CONST_METHOD1(GetEntryAtIndex, content::NavigationEntry*(int i)); |
| 187 MOCK_CONST_METHOD0(GetActiveEntry, content::NavigationEntry*()); | 187 MOCK_CONST_METHOD0(GetActiveEntry, content::NavigationEntry*()); |
| 188 MOCK_CONST_METHOD0(ProfileIsManaged, bool()); | 188 MOCK_CONST_METHOD0(ProfileIsManaged, bool()); |
| 189 MOCK_CONST_METHOD0(GetBlockedNavigations, | 189 MOCK_CONST_METHOD0(GetBlockedNavigations, |
| 190 const std::vector<const content::NavigationEntry*>*()); | 190 const std::vector<const content::NavigationEntry*>*()); |
| 191 MOCK_CONST_METHOD0(IsPinned, bool()); | 191 MOCK_CONST_METHOD0(IsPinned, bool()); |
| 192 MOCK_CONST_METHOD0(HasWebContents, bool()); | 192 MOCK_CONST_METHOD0(HasWebContents, bool()); |
| 193 MOCK_CONST_METHOD0(GetSyncId, int64()); |
| 194 MOCK_METHOD1(SetSyncId, void(int64)); |
| 195 |
| 193 }; | 196 }; |
| 194 | 197 |
| 195 class SyncRefreshListener : public content::NotificationObserver { | 198 class SyncRefreshListener : public content::NotificationObserver { |
| 196 public: | 199 public: |
| 197 SyncRefreshListener() : notified_of_refresh_(false) { | 200 SyncRefreshListener() : notified_of_refresh_(false) { |
| 198 registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, | 201 registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, |
| 199 content::NotificationService::AllSources()); | 202 content::NotificationService::AllSources()); |
| 200 } | 203 } |
| 201 | 204 |
| 202 virtual void Observe(int type, | 205 virtual void Observe(int type, |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 // The new page should be mapped to the old favicon data. | 550 // The new page should be mapped to the old favicon data. |
| 548 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); | 551 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); |
| 549 LoadTabFavicon(tab2); | 552 LoadTabFavicon(tab2); |
| 550 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); | 553 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); |
| 551 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); | 554 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); |
| 552 } | 555 } |
| 553 | 556 |
| 554 } // namespace | 557 } // namespace |
| 555 | 558 |
| 556 } // namespace browser_sync | 559 } // namespace browser_sync |
| OLD | NEW |