| Index: chrome/browser/media/router/mojo/media_router_mojo_impl.h
|
| diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
|
| index 1582a46e52d5228a3927d9f28222e15affca78a0..72f18aa315591956e38c4a75bfebc50f629e0956 100644
|
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h
|
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
|
| @@ -74,14 +74,14 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| content::WebContents* web_contents,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record) override;
|
| + bool incognito) override;
|
| void JoinRoute(const MediaSource::Id& source_id,
|
| const std::string& presentation_id,
|
| const GURL& origin,
|
| content::WebContents* web_contents,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record) override;
|
| + bool incognito) override;
|
| void ConnectRouteByRouteId(
|
| const MediaSource::Id& source,
|
| const MediaRoute::Id& route_id,
|
| @@ -89,7 +89,7 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| content::WebContents* web_contents,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record) override;
|
| + bool incognito) override;
|
| void TerminateRoute(const MediaRoute::Id& route_id) override;
|
| void DetachRoute(const MediaRoute::Id& route_id) override;
|
| void SendRouteMessage(const MediaRoute::Id& route_id,
|
| @@ -124,9 +124,9 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, JoinRoute);
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, JoinRouteTimedOutFails);
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
|
| - JoinRouteOffTheRecordMismatchFails);
|
| + JoinRouteIncognitoMismatchFails);
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
|
| - OffTheRecordRoutesTerminatedOnProfileShutdown);
|
| + IncognitoRoutesTerminatedOnProfileShutdown);
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
|
| RegisterAndUnregisterMediaSinksObserver);
|
| FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
|
| @@ -241,14 +241,14 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| int tab_id,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record);
|
| + bool incognito);
|
| void DoJoinRoute(const MediaSource::Id& source_id,
|
| const std::string& presentation_id,
|
| const std::string& origin,
|
| int tab_id,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record);
|
| + bool incognito);
|
| void DoConnectRouteByRouteId(
|
| const MediaSource::Id& source_id,
|
| const MediaRoute::Id& route_id,
|
| @@ -256,7 +256,7 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| int tab_id,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| base::TimeDelta timeout,
|
| - bool off_the_record);
|
| + bool incognito);
|
| void DoTerminateRoute(const MediaRoute::Id& route_id);
|
| void DoDetachRoute(const MediaRoute::Id& route_id);
|
| void DoSendSessionMessage(const MediaRoute::Id& route_id,
|
| @@ -316,7 +316,7 @@ class MediaRouterMojoImpl : public MediaRouterBase,
|
| // into a local callback.
|
| void RouteResponseReceived(
|
| const std::string& presentation_id,
|
| - bool off_the_record,
|
| + bool incognito,
|
| const std::vector<MediaRouteResponseCallback>& callbacks,
|
| interfaces::MediaRoutePtr media_route,
|
| mojo::String error_text,
|
|
|