Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings

chrome/browser/media/router/presentation_service_delegate_impl_unittest.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/router/presentation_service_delegate_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/mock_media_router.h"
@@ skipping 133 matching lines @@
     PresentationRequest request =
         delegate_impl_->GetDefaultPresentationRequest();
 
     // Should not trigger callback since route response is error.
     std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromError(
         "Error", RouteRequestResult::UNKNOWN_ERROR);
     delegate_impl_->OnRouteResponse(request, *result);
     EXPECT_TRUE(Mock::VerifyAndClearExpectations(this));
 
     // Should not trigger callback since request doesn't match.
-    PresentationRequest different_request(RenderFrameHostId(100, 200),
-                                          {presentation_url2_},
-                                          url::Origin(GURL(kFrameUrl)));
+    PresentationRequest different_request(
+        RenderFrameHostId(100, 200), {presentation_url2_}, GURL(kFrameUrl));
     MediaRoute* media_route = new MediaRoute("differentRouteId", source2_,
                                              "mediaSinkId", "", true, "", true);
     media_route->set_incognito(incognito);
     result = RouteRequestResult::FromSuccess(base::WrapUnique(media_route),
                                              "differentPresentationId");
     delegate_impl_->OnRouteResponse(different_request, *result);
     EXPECT_TRUE(Mock::VerifyAndClearExpectations(this));
 
     // Should trigger callback since request matches.
     EXPECT_CALL(*this, OnDefaultPresentationStarted(_)).Times(1);
@@ skipping 148 matching lines @@
       base::Unretained(this));
   delegate_impl_->SetDefaultPresentationUrls(main_frame_process_id_,
                                              main_frame_routing_id_,
                                              presentation_urls_, callback);
   ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
   PresentationRequest request1 =
       delegate_impl_->GetDefaultPresentationRequest();
   EXPECT_EQ(presentation_url1_, request1.presentation_urls()[0]);
   EXPECT_EQ(RenderFrameHostId(main_frame_process_id_, main_frame_routing_id_),
             request1.render_frame_host_id());
-  EXPECT_EQ(url::Origin(frame_url), request1.frame_origin());
+  EXPECT_EQ(frame_url, request1.frame_url());
 
   // Set to a new default presentation URL
   std::vector<GURL> new_urls = {presentation_url2_};
   delegate_impl_->SetDefaultPresentationUrls(
       main_frame_process_id_, main_frame_routing_id_, new_urls, callback);
   ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
   PresentationRequest request2 =
       delegate_impl_->GetDefaultPresentationRequest();
   EXPECT_EQ(presentation_url2_, request2.presentation_urls()[0]);
   EXPECT_EQ(RenderFrameHostId(main_frame_process_id_, main_frame_routing_id_),
             request2.render_frame_host_id());
-  EXPECT_EQ(url::Origin(frame_url), request2.frame_origin());
+  EXPECT_EQ(frame_url, request2.frame_url());
 
   // Remove default presentation URL.
   delegate_impl_->SetDefaultPresentationUrls(main_frame_process_id_,
                                              main_frame_routing_id_,
                                              std::vector<GURL>(), callback);
   EXPECT_FALSE(delegate_impl_->HasDefaultPresentationRequest());
 }
 
 TEST_F(PresentationServiceDelegateImplTest, DefaultPresentationUrlCallback) {
   RunDefaultPresentationUrlCallbackTest(false);
@@ skipping 13 matching lines @@
   StrictMock<MockDefaultPresentationRequestObserver> observer;
   delegate_impl_->AddDefaultPresentationRequestObserver(&observer);
 
   GURL frame_url(kFrameUrl);
   content::WebContentsTester::For(GetWebContents())
       ->NavigateAndCommit(frame_url);
 
   std::vector<GURL> request1_urls = {presentation_url1_};
   PresentationRequest observed_request1(
       RenderFrameHostId(main_frame_process_id_, main_frame_routing_id_),
-      request1_urls, url::Origin(frame_url));
+      request1_urls, frame_url);
   EXPECT_CALL(observer, OnDefaultPresentationChanged(Equals(observed_request1)))
       .Times(1);
   delegate_impl_->SetDefaultPresentationUrls(
       main_frame_process_id_, main_frame_routing_id_, request1_urls, callback);
 
   ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
   PresentationRequest request1 =
       delegate_impl_->GetDefaultPresentationRequest();
   EXPECT_TRUE(request1.Equals(observed_request1));
 
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&observer));
 
   std::vector<GURL> request2_urls = {presentation_url2_};
   PresentationRequest observed_request2(
       RenderFrameHostId(main_frame_process_id_, main_frame_routing_id_),
-      request2_urls, url::Origin(frame_url));
+      request2_urls, frame_url);
   EXPECT_CALL(observer, OnDefaultPresentationChanged(Equals(observed_request2)))
       .Times(1);
   delegate_impl_->SetDefaultPresentationUrls(
       main_frame_process_id_, main_frame_routing_id_, request2_urls, callback);
   ASSERT_TRUE(delegate_impl_->HasDefaultPresentationRequest());
   PresentationRequest request2 =
       delegate_impl_->GetDefaultPresentationRequest();
   EXPECT_TRUE(request2.Equals(observed_request2));
 
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&observer));
@@ skipping 219 matching lines @@
       base::Bind(&MockCreatePresentationConnnectionCallbacks::
                      OnCreateConnectionSuccess,
                  base::Unretained(&mock_create_connection_callbacks)),
       base::Bind(
           &MockCreatePresentationConnnectionCallbacks::OnCreateConnectionError,
           base::Unretained(&mock_create_connection_callbacks)));
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace media_router