OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/sync/sessions/sessions_sync_manager.h" | 5 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
6 | 6 |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/sessions/session_id.h" | 9 #include "chrome/browser/sessions/session_id.h" |
10 #include "chrome/browser/sessions/session_tab_helper.h" | 10 #include "chrome/browser/sessions/session_tab_helper.h" |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 manager_.reset(); | 248 manager_.reset(); |
249 BrowserWithTestWindowTest::TearDown(); | 249 BrowserWithTestWindowTest::TearDown(); |
250 } | 250 } |
251 | 251 |
252 virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE { | 252 virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE { |
253 return scoped_ptr<DeviceInfo>( | 253 return scoped_ptr<DeviceInfo>( |
254 new DeviceInfo(GetLocalSyncCacheGUID(), | 254 new DeviceInfo(GetLocalSyncCacheGUID(), |
255 "Wayne Gretzky's Hacking Box", | 255 "Wayne Gretzky's Hacking Box", |
256 "Chromium 10k", | 256 "Chromium 10k", |
257 "Chrome 10k", | 257 "Chrome 10k", |
258 sync_pb::SyncEnums_DeviceType_TYPE_LINUX)); | 258 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
| 259 "device_id")); |
259 } | 260 } |
260 | 261 |
261 virtual std::string GetLocalSyncCacheGUID() const OVERRIDE { | 262 virtual std::string GetLocalSyncCacheGUID() const OVERRIDE { |
262 return "cache_guid"; | 263 return "cache_guid"; |
263 } | 264 } |
264 | 265 |
265 SessionsSyncManager* manager() { return manager_.get(); } | 266 SessionsSyncManager* manager() { return manager_.get(); } |
266 SessionSyncTestHelper* helper() { return &helper_; } | 267 SessionSyncTestHelper* helper() { return &helper_; } |
267 | 268 |
268 void InitWithSyncDataTakeOutput(const syncer::SyncDataList& initial_data, | 269 void InitWithSyncDataTakeOutput(const syncer::SyncDataList& initial_data, |
(...skipping 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1813 ASSERT_FALSE(observer.notified_of_refresh()); | 1814 ASSERT_FALSE(observer.notified_of_refresh()); |
1814 InitWithNoSyncData(); | 1815 InitWithNoSyncData(); |
1815 AddTab(browser(), GURL("http://foo1")); | 1816 AddTab(browser(), GURL("http://foo1")); |
1816 EXPECT_FALSE(observer.notified_of_refresh()); | 1817 EXPECT_FALSE(observer.notified_of_refresh()); |
1817 NavigateAndCommitActiveTab(GURL("chrome://newtab/#open_tabs")); | 1818 NavigateAndCommitActiveTab(GURL("chrome://newtab/#open_tabs")); |
1818 EXPECT_TRUE(observer.notified_of_refresh()); | 1819 EXPECT_TRUE(observer.notified_of_refresh()); |
1819 } | 1820 } |
1820 #endif // defined(OS_ANDROID) || defined(OS_IOS) | 1821 #endif // defined(OS_ANDROID) || defined(OS_IOS) |
1821 | 1822 |
1822 } // namespace browser_sync | 1823 } // namespace browser_sync |
OLD | NEW |