[Extensions] Simplify EventFilteringInfo

extensions/common/event_filter.cc

 // Copyright (c) 2012 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 "extensions/common/event_filter.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 126 matching lines @@
     const EventFilteringInfo& event_info,
     int routing_id) const {
   std::set<MatcherID> matchers;
 
   auto it = event_matchers_.find(event_name);
   if (it == event_matchers_.end())
     return matchers;
 
   const EventMatcherMap& matcher_map = it->second;
   const GURL& url_to_match_against =
-      event_info.has_url() ? event_info.url() : GURL::EmptyGURL();
+      event_info.url ? *event_info.url : GURL::EmptyGURL();
   std::set<URLMatcherConditionSet::ID> matching_condition_set_ids =
       url_matcher_.MatchURL(url_to_match_against);
   for (const auto& id_key : matching_condition_set_ids) {
     auto matcher_id = condition_set_id_to_event_matcher_id_.find(id_key);
     if (matcher_id == condition_set_id_to_event_matcher_id_.end()) {
       NOTREACHED() << "id not found in condition set map (" << id_key << ")";
       continue;
     }
     MatcherID id = matcher_id->second;
     EventMatcherMap::const_iterator matcher_entry = matcher_map.find(id);
     if (matcher_entry == matcher_map.end()) {
       // Matcher must be for a different event.
       continue;
     }
     const EventMatcher* event_matcher = matcher_entry->second->event_matcher();
     // The context that installed the event listener should be the same context
     // as the one where the event listener is called.
     if (routing_id != MSG_ROUTING_NONE &&
         event_matcher->GetRoutingID() != routing_id) {
       continue;
     }
     if (event_matcher->MatchNonURLCriteria(event_info)) {
-      CHECK(!event_matcher->HasURLFilters() || event_info.has_url());
+      CHECK(!event_matcher->HasURLFilters() || event_info.url);
       matchers.insert(id);
     }
   }
 
   return matchers;
 }
 
 int EventFilter::GetMatcherCountForEventForTesting(
     const std::string& name) const {
   EventMatcherMultiMap::const_iterator it = event_matchers_.find(name);
   return it != event_matchers_.end() ? it->second.size() : 0;
 }
 
 }  // namespace extensions