| Index: chrome/browser/sync/sessions/tab_node_pool_unittest.cc
 | 
| diff --git a/chrome/browser/sync/sessions/tab_node_pool_unittest.cc b/chrome/browser/sync/sessions/tab_node_pool_unittest.cc
 | 
| deleted file mode 100644
 | 
| index f48b8d38ce54e26b386f7e778fb407319558aaa8..0000000000000000000000000000000000000000
 | 
| --- a/chrome/browser/sync/sessions/tab_node_pool_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,262 +0,0 @@
 | 
| -// Copyright 2014 The Chromium Authors. All rights reserved.
 | 
| -// Use of this source code is governed by a BSD-style license that can be
 | 
| -// found in the LICENSE file.
 | 
| -
 | 
| -#include "chrome/browser/sync/sessions/tab_node_pool.h"
 | 
| -
 | 
| -#include "base/logging.h"
 | 
| -#include "sync/api/sync_change.h"
 | 
| -#include "sync/protocol/session_specifics.pb.h"
 | 
| -#include "sync/protocol/sync.pb.h"
 | 
| -#include "testing/gtest/include/gtest/gtest.h"
 | 
| -
 | 
| -namespace browser_sync {
 | 
| -
 | 
| -class SyncTabNodePoolTest : public testing::Test {
 | 
| - protected:
 | 
| -  SyncTabNodePoolTest() { pool_.SetMachineTag("tag"); }
 | 
| -
 | 
| -  int GetMaxUsedTabNodeId() const { return pool_.max_used_tab_node_id_; }
 | 
| -
 | 
| -  void AddFreeTabNodes(size_t size, const int node_ids[]);
 | 
| -
 | 
| -  TabNodePool pool_;
 | 
| -};
 | 
| -
 | 
| -void SyncTabNodePoolTest::AddFreeTabNodes(
 | 
| -    size_t size, const int node_ids[]) {
 | 
| -  for (size_t i = 0; i < size; ++i) {
 | 
| -    pool_.free_nodes_pool_.insert(node_ids[i]);
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -namespace {
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, TabNodeIdIncreases) {
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  // max_used_tab_node_ always increases.
 | 
| -  pool_.AddTabNode(10);
 | 
| -  EXPECT_EQ(10, GetMaxUsedTabNodeId());
 | 
| -  pool_.AddTabNode(5);
 | 
| -  EXPECT_EQ(10, GetMaxUsedTabNodeId());
 | 
| -  pool_.AddTabNode(1000);
 | 
| -  EXPECT_EQ(1000, GetMaxUsedTabNodeId());
 | 
| -  pool_.ReassociateTabNode(1000, 1);
 | 
| -  pool_.ReassociateTabNode(5, 2);
 | 
| -  pool_.ReassociateTabNode(10, 3);
 | 
| -  // Freeing a tab node does not change max_used_tab_node_id_.
 | 
| -  pool_.FreeTabNode(1000, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  pool_.FreeTabNode(5, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  pool_.FreeTabNode(10, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  for (int i = 0; i < 3; ++i) {
 | 
| -    pool_.AssociateTabNode(pool_.GetFreeTabNode(&changes), i + 1);
 | 
| -    EXPECT_EQ(1000, GetMaxUsedTabNodeId());
 | 
| -  }
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  EXPECT_EQ(1000, GetMaxUsedTabNodeId());
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, OldTabNodesAddAndRemove) {
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  // VerifyOldTabNodes are added.
 | 
| -  pool_.AddTabNode(1);
 | 
| -  pool_.AddTabNode(2);
 | 
| -  EXPECT_EQ(2u, pool_.Capacity());
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.IsUnassociatedTabNode(1));
 | 
| -  EXPECT_TRUE(pool_.IsUnassociatedTabNode(2));
 | 
| -  pool_.ReassociateTabNode(1, 2);
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  pool_.AssociateTabNode(2, 3);
 | 
| -  EXPECT_FALSE(pool_.IsUnassociatedTabNode(1));
 | 
| -  EXPECT_FALSE(pool_.IsUnassociatedTabNode(2));
 | 
| -  pool_.FreeTabNode(2, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  // 2 should be returned to free node pool_.
 | 
| -  EXPECT_EQ(2u, pool_.Capacity());
 | 
| -  // Should be able to free 1.
 | 
| -  pool_.FreeTabNode(1, &changes);
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(1, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  pool_.AssociateTabNode(1, 1);
 | 
| -  EXPECT_EQ(2, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  pool_.AssociateTabNode(2, 1);
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, OldTabNodesReassociation) {
 | 
| -  // VerifyOldTabNodes are reassociated correctly.
 | 
| -  pool_.AddTabNode(4);
 | 
| -  pool_.AddTabNode(5);
 | 
| -  pool_.AddTabNode(6);
 | 
| -  EXPECT_EQ(3u, pool_.Capacity());
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.IsUnassociatedTabNode(4));
 | 
| -  pool_.ReassociateTabNode(4, 5);
 | 
| -  pool_.AssociateTabNode(5, 6);
 | 
| -  pool_.AssociateTabNode(6, 7);
 | 
| -  // Free 5 and 6.
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  pool_.FreeTabNode(5, &changes);
 | 
| -  pool_.FreeTabNode(6, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  // 5 and 6 nodes should not be unassociated.
 | 
| -  EXPECT_FALSE(pool_.IsUnassociatedTabNode(5));
 | 
| -  EXPECT_FALSE(pool_.IsUnassociatedTabNode(6));
 | 
| -  // Free node pool should have 5 and 6.
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_EQ(3u, pool_.Capacity());
 | 
| -
 | 
| -  // Free all nodes
 | 
| -  pool_.FreeTabNode(4, &changes);
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  std::set<int> free_sync_ids;
 | 
| -  for (int i = 0; i < 3; ++i) {
 | 
| -    free_sync_ids.insert(pool_.GetFreeTabNode(&changes));
 | 
| -    // GetFreeTabNode will return the same value till the node is
 | 
| -    // reassociated.
 | 
| -    pool_.AssociateTabNode(pool_.GetFreeTabNode(&changes), i + 1);
 | 
| -  }
 | 
| -
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_EQ(3u, free_sync_ids.size());
 | 
| -  EXPECT_EQ(1u, free_sync_ids.count(4));
 | 
| -  EXPECT_EQ(1u, free_sync_ids.count(5));
 | 
| -  EXPECT_EQ(1u, free_sync_ids.count(6));
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, Init) {
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, AddGet) {
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  int free_nodes[] = {5, 10};
 | 
| -  AddFreeTabNodes(2, free_nodes);
 | 
| -
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  EXPECT_EQ(5, pool_.GetFreeTabNode(&changes));
 | 
| -  pool_.AssociateTabNode(5, 1);
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  // 5 is now used, should return 10.
 | 
| -  EXPECT_EQ(10, pool_.GetFreeTabNode(&changes));
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, All) {
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(0U, pool_.Capacity());
 | 
| -
 | 
| -  // GetFreeTabNode returns the lowest numbered free node.
 | 
| -  EXPECT_EQ(0, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_EQ(1U, changes.size());
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(1U, pool_.Capacity());
 | 
| -
 | 
| -  // Associate 5, next free node should be 10.
 | 
| -  pool_.AssociateTabNode(0, 1);
 | 
| -  EXPECT_EQ(1, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_EQ(2U, changes.size());
 | 
| -  changes.clear();
 | 
| -  pool_.AssociateTabNode(1, 2);
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  // Release them in reverse order.
 | 
| -  pool_.FreeTabNode(1, &changes);
 | 
| -  pool_.FreeTabNode(0, &changes);
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(0, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  pool_.AssociateTabNode(0, 1);
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  EXPECT_EQ(1, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_TRUE(changes.empty());
 | 
| -  pool_.AssociateTabNode(1, 2);
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  // Release them again.
 | 
| -  pool_.FreeTabNode(1, &changes);
 | 
| -  pool_.FreeTabNode(0, &changes);
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(2U, pool_.Capacity());
 | 
| -  pool_.Clear();
 | 
| -  EXPECT_TRUE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(0U, pool_.Capacity());
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, GetFreeTabNodeCreate) {
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  EXPECT_EQ(0, pool_.GetFreeTabNode(&changes));
 | 
| -  EXPECT_TRUE(changes[0].IsValid());
 | 
| -  EXPECT_EQ(syncer::SyncChange::ACTION_ADD, changes[0].change_type());
 | 
| -  EXPECT_TRUE(changes[0].sync_data().IsValid());
 | 
| -  sync_pb::EntitySpecifics entity = changes[0].sync_data().GetSpecifics();
 | 
| -  sync_pb::SessionSpecifics specifics(entity.session());
 | 
| -  EXPECT_EQ(0, specifics.tab_node_id());
 | 
| -}
 | 
| -
 | 
| -TEST_F(SyncTabNodePoolTest, TabPoolFreeNodeLimits) {
 | 
| -  // Allocate TabNodePool::kFreeNodesHighWatermark + 1 nodes and verify that
 | 
| -  // freeing the last node reduces the free node pool size to
 | 
| -  // kFreeNodesLowWatermark.
 | 
| -  syncer::SyncChangeList changes;
 | 
| -  SessionID session_id;
 | 
| -  std::vector<int> used_sync_ids;
 | 
| -  for (size_t i = 1; i <= TabNodePool::kFreeNodesHighWatermark + 1; ++i) {
 | 
| -    session_id.set_id(i);
 | 
| -    int sync_id = pool_.GetFreeTabNode(&changes);
 | 
| -    pool_.AssociateTabNode(sync_id, i);
 | 
| -    used_sync_ids.push_back(sync_id);
 | 
| -  }
 | 
| -
 | 
| -  // Free all except one node.
 | 
| -  int last_sync_id = used_sync_ids.back();
 | 
| -  used_sync_ids.pop_back();
 | 
| -
 | 
| -  for (size_t i = 0; i < used_sync_ids.size(); ++i) {
 | 
| -    pool_.FreeTabNode(used_sync_ids[i], &changes);
 | 
| -  }
 | 
| -
 | 
| -  // Except one node all nodes should be in FreeNode pool.
 | 
| -  EXPECT_FALSE(pool_.Full());
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  // Total capacity = 1 Associated Node + kFreeNodesHighWatermark free node.
 | 
| -  EXPECT_EQ(TabNodePool::kFreeNodesHighWatermark + 1, pool_.Capacity());
 | 
| -
 | 
| -  // Freeing the last sync node should drop the free nodes to
 | 
| -  // kFreeNodesLowWatermark.
 | 
| -  pool_.FreeTabNode(last_sync_id, &changes);
 | 
| -  EXPECT_FALSE(pool_.Empty());
 | 
| -  EXPECT_TRUE(pool_.Full());
 | 
| -  EXPECT_EQ(TabNodePool::kFreeNodesLowWatermark, pool_.Capacity());
 | 
| -}
 | 
| -
 | 
| -}  // namespace
 | 
| -
 | 
| -}  // namespace browser_sync
 | 
| 
 |