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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(GetActiveEntry, content::NavigationEntry*()); |
188 MOCK_CONST_METHOD0(IsPinned, bool()); | 188 MOCK_CONST_METHOD0(IsPinned, bool()); |
| 189 MOCK_CONST_METHOD0(HasWebContents, bool()); |
189 }; | 190 }; |
190 | 191 |
191 class SyncRefreshListener : public content::NotificationObserver { | 192 class SyncRefreshListener : public content::NotificationObserver { |
192 public: | 193 public: |
193 SyncRefreshListener() : notified_of_refresh_(false) { | 194 SyncRefreshListener() : notified_of_refresh_(false) { |
194 registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, | 195 registrar_.Add(this, chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, |
195 content::NotificationService::AllSources()); | 196 content::NotificationService::AllSources()); |
196 } | 197 } |
197 | 198 |
198 virtual void Observe(int type, | 199 virtual void Observe(int type, |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 // The new page should be mapped to the old favicon data. | 466 // The new page should be mapped to the old favicon data. |
466 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); | 467 EXPECT_TRUE(FaviconEquals(GURL(page_url2), std::string())); |
467 LoadTabFavicon(tab2); | 468 LoadTabFavicon(tab2); |
468 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); | 469 EXPECT_TRUE(FaviconEquals(GURL(page_url), favicon)); |
469 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); | 470 EXPECT_TRUE(FaviconEquals(GURL(page_url2), favicon)); |
470 } | 471 } |
471 | 472 |
472 } // namespace | 473 } // namespace |
473 | 474 |
474 } // namespace browser_sync | 475 } // namespace browser_sync |
OLD | NEW |