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

Unified Diff: chrome/browser/apps/app_browsertest_util.h

Issue 2525563003: mash: Change CastConfigDelegate to a mojoified CastConfigClient. (Closed)
Patch Set: Now for the external apitests as well. Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/apps/app_browsertest_util.h
diff --git a/chrome/browser/apps/app_browsertest_util.h b/chrome/browser/apps/app_browsertest_util.h
index 5730ce5884cc58ed0aa5f296f3defa2131a89509..195a2a9ce157ab92ea8d0a855c15e6a33f7a506b 100644
--- a/chrome/browser/apps/app_browsertest_util.h
+++ b/chrome/browser/apps/app_browsertest_util.h
@@ -11,6 +11,10 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "extensions/browser/app_window/app_window.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/media/router/mock_media_router.h"
+#endif
+
namespace base {
class CommandLine;
}
@@ -31,6 +35,8 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
PlatformAppBrowserTest();
void SetUpCommandLine(base::CommandLine* command_line) override;
+ void SetUpInProcessBrowserTestFixture() override;
+ void TearDownInProcessBrowserTestFixture() override;
// Gets the first app window that is found for a given browser.
static AppWindow* GetFirstAppWindowForBrowser(Browser* browser);
@@ -117,6 +123,10 @@ class PlatformAppBrowserTest : public ExtensionApiTest {
AppWindow* CreateTestAppWindow(const std::string& window_create_options);
private:
+#if defined(OS_CHROMEOS)
+ media_router::MockMediaRouter media_router_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(PlatformAppBrowserTest);
};

Powered by Google App Engine
This is Rietveld 408576698