[Media Router] Clean up issues related code.

chrome/browser/media/router/test_helper.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 21 matching lines @@
     return false;
   }
   for (size_t i = 0; i < arg.size(); ++i) {
     if (!arg[i].Equals(other[i])) {
       return false;
     }
   }
   return true;
 }
 
-// Matcher for checking all fields in Issue objects except the ID.
-MATCHER_P(EqualsIssue, other, "") {
-  if (arg.title() != other.title())
-    return false;
-
-  if (arg.message() != other.message())
-    return false;
-
-  if (!arg.default_action().Equals(other.default_action()))
-    return false;
-
-  if (arg.secondary_actions().size() != other.secondary_actions().size())
-    return false;
-
-  for (size_t i = 0; i < arg.secondary_actions().size(); ++i) {
-    if (!arg.secondary_actions()[i].Equals(other.secondary_actions()[i]))
-      return false;
-  }
-
-  if (arg.route_id() != other.route_id())
-    return false;
-
-  if (arg.severity() != other.severity())
-    return false;
-
-  if (arg.is_blocking() != other.is_blocking())
-    return false;
-
-  if (arg.help_page_id() != other.help_page_id())
-    return false;
-
-  return true;
-}
-
+// Matcher for IssueInfo title.
 MATCHER_P(IssueTitleEquals, title, "") {
-  return arg.title() == title;
+  return arg.title == title;
 }
 
 MATCHER_P(StateChangeInfoEquals, other, "") {
   return arg.state == other.state && arg.close_reason == other.close_reason &&
          arg.message == other.message;
 }
 
 class MockIssuesObserver : public IssuesObserver {
  public:
   explicit MockIssuesObserver(MediaRouter* router);
   ~MockIssuesObserver() override;
 
-  MOCK_METHOD1(OnIssueUpdated, void(const Issue* issue));
+  MOCK_METHOD1(OnIssue, void(const Issue& issue));
+  MOCK_METHOD0(OnIssuesCleared, void());
 };
 
 class MockMediaSinksObserver : public MediaSinksObserver {
  public:
   MockMediaSinksObserver(MediaRouter* router,
                          const MediaSource& source,
                          const GURL& origin);
   ~MockMediaSinksObserver() override;
 
   MOCK_METHOD1(OnSinksReceived, void(const std::vector<MediaSink>& sinks));
@@ skipping 13 matching lines @@
  public:
   MockPresentationConnectionStateChangedCallback();
   ~MockPresentationConnectionStateChangedCallback();
   MOCK_METHOD1(Run,
                void(const content::PresentationConnectionStateChangeInfo&));
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_