Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: chrome/test/media_router/media_router_e2e_browsertest.cc

Issue 1826403002: [Media Router] Moves mojo-specific code into mojo/ folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert change to media_router.mojom to fix compile Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/media_router/media_router_e2e_browsertest.h" 5 #include "chrome/test/media_router/media_router_e2e_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "chrome/browser/media/router/media_router.h" 11 #include "chrome/browser/media/router/media_router.h"
12 #include "chrome/browser/media/router/media_router_factory.h" 12 #include "chrome/browser/media/router/media_router_factory.h"
13 #include "chrome/browser/media/router/media_router_mojo_impl.h"
14 #include "chrome/browser/media/router/media_source.h" 13 #include "chrome/browser/media/router/media_source.h"
15 #include "chrome/browser/media/router/media_source_helper.h" 14 #include "chrome/browser/media/router/media_source_helper.h"
16 #include "chrome/browser/media/router/route_request_result.h" 15 #include "chrome/browser/media/router/route_request_result.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/sessions/session_tab_helper.h" 17 #include "chrome/browser/sessions/session_tab_helper.h"
19 #include "chrome/browser/ui/browser_finder.h" 18 #include "chrome/browser/ui/browser_finder.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/test/base/ui_test_utils.h" 20 #include "chrome/test/base/ui_test_utils.h"
22 #include "content/public/test/test_utils.h" 21 #include "content/public/test/test_utils.h"
23 #include "media/base/test_data_util.h" 22 #include "media/base/test_data_util.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl), 161 CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl),
163 GURL(kOriginUrl), nullptr); 162 GURL(kOriginUrl), nullptr);
164 Wait(base::TimeDelta::FromSeconds(30)); 163 Wait(base::TimeDelta::FromSeconds(30));
165 164
166 // Wait for 10 seconds to make sure route has been stopped. 165 // Wait for 10 seconds to make sure route has been stopped.
167 StopMediaRoute(); 166 StopMediaRoute();
168 Wait(base::TimeDelta::FromSeconds(10)); 167 Wait(base::TimeDelta::FromSeconds(10));
169 } 168 }
170 169
171 } // namespace media_router 170 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698