Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: chrome/browser/sync/glue/session_model_associator_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "chrome/browser/sync/glue/session_model_associator.h" 11 #include "chrome/browser/sync/glue/session_model_associator.h"
12 #include "chrome/browser/sync/glue/synced_tab_delegate.h" 12 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
13 #include "chrome/browser/sync/profile_sync_service_mock.h" 13 #include "chrome/browser/sync/profile_sync_service_mock.h"
14 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/profile_mock.h" 16 #include "chrome/test/base/profile_mock.h"
17 #include "content/public/browser/navigation_entry.h" 17 #include "content/public/browser/navigation_entry.h"
18 #include "content/public/browser/notification_details.h" 18 #include "content/public/browser/notification_details.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 #include "content/public/common/page_transition_types.h" 20 #include "content/public/common/page_transition_types.h"
21 #include "content/test/test_browser_thread.h" 21 #include "content/public/test/test_browser_thread.h"
22 #include "sync/protocol/session_specifics.pb.h" 22 #include "sync/protocol/session_specifics.pb.h"
23 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #include "sync/util/time.h" 25 #include "sync/util/time.h"
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 using testing::NiceMock; 28 using testing::NiceMock;
29 using testing::Return; 29 using testing::Return;
30 using testing::_; 30 using testing::_;
31 31
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 sync_tab.navigation(2).virtual_url()); 830 sync_tab.navigation(2).virtual_url());
831 EXPECT_EQ(1, sync_tab.current_navigation_index()); 831 EXPECT_EQ(1, sync_tab.current_navigation_index());
832 EXPECT_EQ(2, sync_tab.navigation(0).timestamp()); 832 EXPECT_EQ(2, sync_tab.navigation(0).timestamp());
833 EXPECT_LE(now, sync_tab.navigation(1).timestamp()); 833 EXPECT_LE(now, sync_tab.navigation(1).timestamp());
834 EXPECT_LE(now, sync_tab.navigation(2).timestamp()); 834 EXPECT_LE(now, sync_tab.navigation(2).timestamp());
835 EXPECT_EQ(3U, prev_tab.navigations.size()); 835 EXPECT_EQ(3U, prev_tab.navigations.size());
836 EXPECT_EQ(3U, prev_tab.synced_tab_navigations.size()); 836 EXPECT_EQ(3U, prev_tab.synced_tab_navigations.size());
837 } 837 }
838 838
839 } // namespace browser_sync 839 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698