| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 5 #include <map> | 
| 6 #include <string> | 6 #include <string> | 
| 7 | 7 | 
|  | 8 #include "base/location.h" | 
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 9 #include "base/message_loop.h" | 10 #include "base/message_loop.h" | 
| 10 #include "base/scoped_temp_dir.h" | 11 #include "base/scoped_temp_dir.h" | 
| 11 #include "base/stl_util.h" | 12 #include "base/stl_util.h" | 
| 12 #include "base/task.h" | 13 #include "base/task.h" | 
| 13 #include "base/tracked.h" |  | 
| 14 #include "chrome/browser/sessions/session_service_factory.h" | 14 #include "chrome/browser/sessions/session_service_factory.h" | 
| 15 #include "chrome/browser/sessions/session_service.h" | 15 #include "chrome/browser/sessions/session_service.h" | 
| 16 #include "chrome/browser/sessions/session_service_test_helper.h" | 16 #include "chrome/browser/sessions/session_service_test_helper.h" | 
| 17 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 17 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 
| 18 #include "chrome/browser/sync/glue/session_change_processor.h" | 18 #include "chrome/browser/sync/glue/session_change_processor.h" | 
| 19 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 19 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 
| 20 #include "chrome/browser/sync/glue/session_model_associator.h" | 20 #include "chrome/browser/sync/glue/session_model_associator.h" | 
| 21 #include "chrome/browser/sync/glue/sync_backend_host.h" | 21 #include "chrome/browser/sync/glue/sync_backend_host.h" | 
| 22 #include "chrome/browser/sync/internal_api/change_record.h" | 22 #include "chrome/browser/sync/internal_api/change_record.h" | 
| 23 #include "chrome/browser/sync/internal_api/read_node.h" | 23 #include "chrome/browser/sync/internal_api/read_node.h" | 
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 456   ASSERT_FALSE(model_associator_->tab_pool_.full()); | 456   ASSERT_FALSE(model_associator_->tab_pool_.full()); | 
| 457   for (size_t i = 0; i < num_ids; ++i) { | 457   for (size_t i = 0; i < num_ids; ++i) { | 
| 458     model_associator_->tab_pool_.FreeTabNode(node_ids[i]); | 458     model_associator_->tab_pool_.FreeTabNode(node_ids[i]); | 
| 459   } | 459   } | 
| 460   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity()); | 460   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity()); | 
| 461   ASSERT_FALSE(model_associator_->tab_pool_.empty()); | 461   ASSERT_FALSE(model_associator_->tab_pool_.empty()); | 
| 462   ASSERT_TRUE(model_associator_->tab_pool_.full()); | 462   ASSERT_TRUE(model_associator_->tab_pool_.full()); | 
| 463 } | 463 } | 
| 464 | 464 | 
| 465 }  // namespace browser_sync | 465 }  // namespace browser_sync | 
| OLD | NEW | 
|---|