[Media Router] Add origins to sink query results.

chrome/browser/media/android/router/media_router_android.cc

 // 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.
 
 #include "chrome/browser/media/android/router/media_router_android.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 341 matching lines @@
             env, java_media_router_.obj(), jsource_urn, i);
     sinks_converted.push_back(
         MediaSink(ConvertJavaStringToUTF8(env, jsink_urn.obj()),
         ConvertJavaStringToUTF8(env, jsink_name.obj()),
         MediaSink::GENERIC));
   }
 
   std::string source_urn = ConvertJavaStringToUTF8(env, jsource_urn);
   auto it = sinks_observers_.find(source_urn);
   if (it != sinks_observers_.end()) {
+    // TODO(imcheng): Pass origins to OnSinksUpdated (crbug.com/594858).
     FOR_EACH_OBSERVER(MediaSinksObserver, *it->second,
-                      OnSinksReceived(sinks_converted));
+                      OnSinksUpdated(sinks_converted, std::vector<GURL>()));
   }
 }
 
 void MediaRouterAndroid::OnRouteCreated(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& jmedia_route_id,
     const JavaParamRef<jstring>& jsink_id,
     jint jroute_request_id,
     jboolean jis_local) {
@@ skipping 76 matching lines @@
   scoped_ptr<content::PresentationSessionMessage> message(
       new content::PresentationSessionMessage(content::TEXT));
   message->message = ConvertJavaStringToUTF8(env, jmessage);
   session_messages.push_back(std::move(message));
 
   FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
                     OnMessagesReceived(session_messages, true));
 }
 
 }  // namespace media_router