| 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/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 MOCK_CONST_METHOD0(GetWindowId, SessionID::id_type()); | 177 MOCK_CONST_METHOD0(GetWindowId, SessionID::id_type()); |
| 178 MOCK_CONST_METHOD0(GetSessionId, SessionID::id_type()); | 178 MOCK_CONST_METHOD0(GetSessionId, SessionID::id_type()); |
| 179 MOCK_CONST_METHOD0(IsBeingDestroyed, bool()); | 179 MOCK_CONST_METHOD0(IsBeingDestroyed, bool()); |
| 180 MOCK_CONST_METHOD0(profile, Profile*()); | 180 MOCK_CONST_METHOD0(profile, Profile*()); |
| 181 MOCK_CONST_METHOD0(GetExtensionAppId, std::string()); | 181 MOCK_CONST_METHOD0(GetExtensionAppId, std::string()); |
| 182 MOCK_CONST_METHOD0(GetCurrentEntryIndex, int()); | 182 MOCK_CONST_METHOD0(GetCurrentEntryIndex, int()); |
| 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(GetVisibleEntry, 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(GetWebContents, content::WebContents*()); | 193 MOCK_CONST_METHOD0(GetWebContents, content::WebContents*()); |
| 194 MOCK_CONST_METHOD0(GetSyncId, int()); | 194 MOCK_CONST_METHOD0(GetSyncId, int()); |
| 195 MOCK_METHOD1(SetSyncId, void(int)); | 195 MOCK_METHOD1(SetSyncId, void(int)); |
| 196 }; | 196 }; |
| 197 | 197 |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 // The new page should be mapped to the old favicon data. | 556 // The new page should be mapped to the old favicon data. |
| 557 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); | 557 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); |
| 558 LoadTabFavicon(tab2); | 558 LoadTabFavicon(tab2); |
| 559 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); | 559 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); |
| 560 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); | 560 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); |
| 561 } | 561 } |
| 562 | 562 |
| 563 } // namespace | 563 } // namespace |
| 564 | 564 |
| 565 } // namespace browser_sync | 565 } // namespace browser_sync |
| OLD | NEW |