Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / toolbar / recent_tabs_builder_test_helper.cc

diff --git a/src/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc b/src/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
index 27c3faa..fa28e50 100644 (file)
--- a/src/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
+++ b/src/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc
@@ -8,9 +8,10 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
-#include "chrome/browser/sync/sessions2/sessions_sync_manager.h"
+#include "chrome/browser/sync/sessions/sessions_sync_manager.h"
+#include "sync/api/attachments/attachment_id.h"
+#include "sync/api/attachments/attachment_service_proxy_for_test.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -193,39 +194,30 @@ void RecentTabsBuilderTestHelper::ExportToSessionsSyncManager(
         sync_pb::SessionSpecifics* tab_base = entity.mutable_session();
         BuildTabSpecifics(s, w, t, tab_base);
         changes.push_back(syncer::SyncChange(
-            FROM_HERE, syncer::SyncChange::ACTION_ADD,
+            FROM_HERE,
+            syncer::SyncChange::ACTION_ADD,
             syncer::SyncData::CreateRemoteData(
-                tab_base->tab_node_id(), entity, GetTabTimestamp(s, w, t))));
+                tab_base->tab_node_id(),
+                entity,
+                GetTabTimestamp(s, w, t),
+                syncer::AttachmentIdList(),
+                syncer::AttachmentServiceProxyForTest::Create())));
       }
     }
     changes.push_back(syncer::SyncChange(
-        FROM_HERE, syncer::SyncChange::ACTION_ADD,
-        syncer::SyncData::CreateRemoteData(1, session_entity,
-                                          GetSessionTimestamp(s))));
+        FROM_HERE,
+        syncer::SyncChange::ACTION_ADD,
+        syncer::SyncData::CreateRemoteData(
+            1,
+            session_entity,
+            GetSessionTimestamp(s),
+            syncer::AttachmentIdList(),
+            syncer::AttachmentServiceProxyForTest::Create())));
   }
   manager->ProcessSyncChanges(FROM_HERE, changes);
   VerifyExport(manager);
 }
 
-void RecentTabsBuilderTestHelper::ExportToSessionModelAssociator(
-    browser_sync::SessionModelAssociator* associator) {
-  for (int s = 0; s < GetSessionCount(); ++s) {
-    sync_pb::SessionSpecifics meta;
-    BuildSessionSpecifics(s, &meta);
-    for (int w = 0; w < GetWindowCount(s); ++w) {
-      BuildWindowSpecifics(s, w, &meta);
-      for (int t = 0; t < GetTabCount(s, w); ++t) {
-        sync_pb::SessionSpecifics tab_base;
-        BuildTabSpecifics(s, w, t, &tab_base);
-        associator->AssociateForeignSpecifics(tab_base,
-                                              GetTabTimestamp(s, w, t));
-      }
-    }
-    associator->AssociateForeignSpecifics(meta, GetSessionTimestamp(s));
-  }
-  VerifyExport(associator);
-}
-
 void RecentTabsBuilderTestHelper::VerifyExport(
     browser_sync::OpenTabsUIDelegate* delegate) {
   // Make sure data is populated correctly in SessionModelAssociator.