From 8da96f9fd1bdf777496444579a86656112309a79 Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Mon, 4 May 2015 12:08:04 -0700
Subject: [PATCH] CommentsIT: Use @CanonicalWebUrl from AbstractDaemonTest

This was added in two separate places in the commit-footers and
multidraft topics, and merged cleanly. Remove the redundancy.

Change-Id: If83e53e46916f3037ade4e14bf3d1ec47c74d434
---
 .../google/gerrit/acceptance/server/change/CommentsIT.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
index 2fa6eb2e92..b7f2d72154 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java
@@ -39,7 +39,6 @@ import com.google.gerrit.server.change.ChangesCollection;
 import com.google.gerrit.server.change.PostReview;
 import com.google.gerrit.server.change.RevisionResource;
 import com.google.gerrit.server.change.Revisions;
-import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gerrit.testutil.ConfigSuite;
 import com.google.gerrit.testutil.FakeEmailSender;
@@ -72,10 +71,6 @@ public class CommentsIT extends AbstractDaemonTest {
   @Inject
   private Provider<PostReview> postReview;
 
-  @Inject
-  @CanonicalWebUrl
-  private Provider<String> urlProvider;
-
   @Inject
   private FakeEmailSender email;
 
@@ -334,7 +329,7 @@ public class CommentsIT extends AbstractDaemonTest {
     ImmutableList<Message> messages =
         email.getMessages(r2.getChangeId(), "comment");
     assertThat(messages).hasSize(1);
-    String url = urlProvider.get();
+    String url = canonicalWebUrl.get();
     int c = r1.getChange().getId().get();
     assertThat(messages.get(0).body()).contains(
         "\n"