Revert of Revert of Adding CopresenceState

components/copresence/handlers/audio/audio_directive_list_unittest.cc

Index: components/copresence/handlers/audio/audio_directive_list_unittest.cc
diff --git a/components/copresence/handlers/audio/audio_directive_list_unittest.cc b/components/copresence/handlers/audio/audio_directive_list_unittest.cc
index d95e3b38259a9109b3616ccd51e9c92d126b37b1..ac7bd41752aa976f4c5e2a26c6c4fd222444da55 100644
--- a/components/copresence/handlers/audio/audio_directive_list_unittest.cc
+++ b/components/copresence/handlers/audio/audio_directive_list_unittest.cc
@@ -13,6 +13,14 @@
 
 namespace copresence {
 
+static const int64 kTtl = 10;
+
+const Directive CreateDirective(int64 ttl) {
+  Directive directive;
+  directive.set_ttl_millis(ttl);
+  return directive;
+}
+
 class AudioDirectiveListTest : public testing::Test {
  public:
   AudioDirectiveListTest() : directive_list_(new AudioDirectiveList) {}
@@ -23,13 +31,11 @@
 };
 
 TEST_F(AudioDirectiveListTest, Basic) {
-  const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
-
   EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
 
-  directive_list_->AddDirective("op_id1", kTtl);
-  directive_list_->AddDirective("op_id2", kTtl * 3);
-  directive_list_->AddDirective("op_id3", kTtl * 2);
+  directive_list_->AddDirective("op_id1", CreateDirective(kTtl));
+  directive_list_->AddDirective("op_id2", CreateDirective(kTtl * 3));
+  directive_list_->AddDirective("op_id3", CreateDirective(kTtl * 2));
   EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id);
 
   directive_list_->RemoveDirective("op_id2");
@@ -37,13 +43,11 @@
 }
 
 TEST_F(AudioDirectiveListTest, AddDirectiveMultiple) {
-  const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
-
-  directive_list_->AddDirective("op_id1", kTtl);
-  directive_list_->AddDirective("op_id2", kTtl * 2);
-  directive_list_->AddDirective("op_id3", kTtl * 3 * 2);
-  directive_list_->AddDirective("op_id3", kTtl * 3 * 3);
-  directive_list_->AddDirective("op_id4", kTtl * 4);
+  directive_list_->AddDirective("op_id1", CreateDirective(kTtl));
+  directive_list_->AddDirective("op_id2", CreateDirective(kTtl * 2));
+  directive_list_->AddDirective("op_id3", CreateDirective(kTtl * 3 * 2));
+  directive_list_->AddDirective("op_id3", CreateDirective(kTtl * 3 * 3));
+  directive_list_->AddDirective("op_id4", CreateDirective(kTtl * 4));
 
   EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id);
   directive_list_->RemoveDirective("op_id3");
@@ -57,12 +61,10 @@
 }
 
 TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {
-  const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
-
-  directive_list_->AddDirective("op_id1", kTtl);
-  directive_list_->AddDirective("op_id2", kTtl * 2);
-  directive_list_->AddDirective("op_id3", kTtl * 3);
-  directive_list_->AddDirective("op_id4", kTtl * 4);
+  directive_list_->AddDirective("op_id1", CreateDirective(kTtl));
+  directive_list_->AddDirective("op_id2", CreateDirective(kTtl * 2));
+  directive_list_->AddDirective("op_id3", CreateDirective(kTtl * 3));
+  directive_list_->AddDirective("op_id4", CreateDirective(kTtl * 4));
 
   EXPECT_EQ("op_id4", directive_list_->GetActiveDirective()->op_id);
   directive_list_->RemoveDirective("op_id4");