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

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

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typo in a chrome/test/BUILD.gn Created 5 years, 5 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
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "chrome/browser/media/router/media_router.h" 9 #include "chrome/browser/media/router/media_router.h"
10 #include "chrome/browser/media/router/media_router_factory.h"
10 #include "chrome/browser/media/router/media_router_mojo_impl.h" 11 #include "chrome/browser/media/router/media_router_mojo_impl.h"
11 #include "chrome/browser/media/router/media_router_mojo_impl_factory.h"
12 #include "chrome/browser/media/router/media_source.h" 12 #include "chrome/browser/media/router/media_source.h"
13 #include "chrome/browser/media/router/media_source_helper.h" 13 #include "chrome/browser/media/router/media_source_helper.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/sessions/session_tab_helper.h" 15 #include "chrome/browser/sessions/session_tab_helper.h"
16 #include "chrome/browser/ui/browser_finder.h" 16 #include "chrome/browser/ui/browser_finder.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/test/test_utils.h" 19 #include "content/public/test/test_utils.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
(...skipping 22 matching lines...) Expand all
44 MediaRouterE2EBrowserTest::MediaRouterE2EBrowserTest() 44 MediaRouterE2EBrowserTest::MediaRouterE2EBrowserTest()
45 : media_router_(nullptr) { 45 : media_router_(nullptr) {
46 } 46 }
47 47
48 MediaRouterE2EBrowserTest::~MediaRouterE2EBrowserTest() { 48 MediaRouterE2EBrowserTest::~MediaRouterE2EBrowserTest() {
49 } 49 }
50 50
51 void MediaRouterE2EBrowserTest::SetUpOnMainThread() { 51 void MediaRouterE2EBrowserTest::SetUpOnMainThread() {
52 MediaRouterBaseBrowserTest::SetUpOnMainThread(); 52 MediaRouterBaseBrowserTest::SetUpOnMainThread();
53 media_router_ = 53 media_router_ =
54 MediaRouterMojoImplFactory::GetApiForBrowserContext(browser()->profile()); 54 MediaRouterFactory::GetApiForBrowserContext(browser()->profile());
55 DCHECK(media_router_); 55 DCHECK(media_router_);
56 } 56 }
57 57
58 void MediaRouterE2EBrowserTest::TearDownOnMainThread() { 58 void MediaRouterE2EBrowserTest::TearDownOnMainThread() {
59 MediaRouterBaseBrowserTest::TearDownOnMainThread(); 59 MediaRouterBaseBrowserTest::TearDownOnMainThread();
60 media_router_ = nullptr; 60 media_router_ = nullptr;
61 } 61 }
62 62
63 void MediaRouterE2EBrowserTest::OnRouteResponseReceived( 63 void MediaRouterE2EBrowserTest::OnRouteResponseReceived(
64 scoped_ptr<MediaRoute> route, 64 scoped_ptr<MediaRoute> route,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl), 147 CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl),
148 GURL("http://origin/"), kInvalidTabId); 148 GURL("http://origin/"), kInvalidTabId);
149 Wait(base::TimeDelta::FromSeconds(30)); 149 Wait(base::TimeDelta::FromSeconds(30));
150 150
151 // Wait for 10 seconds to make sure route has been stopped. 151 // Wait for 10 seconds to make sure route has been stopped.
152 StopMediaRoute(); 152 StopMediaRoute();
153 Wait(base::TimeDelta::FromSeconds(10)); 153 Wait(base::TimeDelta::FromSeconds(10));
154 } 154 }
155 155
156 } // namespace media_router 156 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698