[Media Router] Add integration browser tests

chrome/test/media_router/media_router_base_browsertest.cc

Index: chrome/test/media_router/media_router_base_browsertest.cc
diff --git a/chrome/test/media_router/media_router_base_browsertest.cc b/chrome/test/media_router/media_router_base_browsertest.cc
index c482015ebbd543f3f76ec7f85b94cc2ca00e4156..95503333fb70070ec89eeb8cfc8bf24ab94733b0 100644
--- a/chrome/test/media_router/media_router_base_browsertest.cc
+++ b/chrome/test/media_router/media_router_base_browsertest.cc
@@ -21,8 +21,6 @@
 
 
 namespace {
-// Command line argument to specify CRX extension location.
-const char kExtensionCrx[] = "extension-crx";
 // Command line argument to specify unpacked extension location.
 const char kExtensionUnpacked[] = "extension-unpacked";
 }  // namespace
@@ -50,8 +48,8 @@ void MediaRouterBaseBrowserTest::TearDown() {
 
 void MediaRouterBaseBrowserTest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
-  extensions::ProcessManager* process_manager =
-      extensions::ProcessManager::Get(browser()->profile());
+  extensions::ProcessManager* process_manager = extensions::ProcessManager::Get(
+      browser()->profile()->GetOriginalProfile());
   DCHECK(process_manager);
   process_manager->AddObserver(this);
   InstallAndEnableMRExtension();
@@ -68,12 +66,8 @@ void MediaRouterBaseBrowserTest::TearDownOnMainThread() {
 }
 
 void MediaRouterBaseBrowserTest::InstallAndEnableMRExtension() {
-  if (is_unpacked()) {
-    const extensions::Extension* extension = LoadExtension(extension_unpacked_);
-    extension_id_ = extension->id();
-  } else {
-    NOTIMPLEMENTED();
-  }
+  const extensions::Extension* extension = LoadExtension(extension_unpacked_);
+  extension_id_ = extension->id();
 }
 
 void MediaRouterBaseBrowserTest::UninstallMRExtension() {
@@ -117,12 +111,10 @@ void MediaRouterBaseBrowserTest::OnBackgroundHostCreated(
 void MediaRouterBaseBrowserTest::ParseCommandLine() {
   DVLOG(0) << "ParseCommandLine";
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-
-  extension_crx_ = command_line->GetSwitchValuePath(kExtensionCrx);
   extension_unpacked_ = command_line->GetSwitchValuePath(kExtensionUnpacked);
 
   // Check if there is mr_extension folder under PRODUCT_DIR folder.
-  if (extension_crx_.empty() && extension_unpacked_.empty()) {
+  if (extension_unpacked_.empty()) {
     base::FilePath base_dir;
     ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &base_dir));
     base::FilePath extension_path =
@@ -132,8 +124,12 @@ void MediaRouterBaseBrowserTest::ParseCommandLine() {
     }
   }
 
-  // Exactly one of these two arguments should be provided.
-  ASSERT_NE(extension_crx_.empty(), extension_unpacked_.empty());
+  // An unpacked component extension must be provided.
+  ASSERT_FALSE(extension_unpacked_.empty());
+}
+
+Browser* MediaRouterBaseBrowserTest::browser() {
+  return ExtensionBrowserTest::browser();

[mark a. foltz, 2017/02/09 23:29:58]

If this method returns a Browser*, there's no need to override it from the
superclass.

[takumif, 2017/02/14 19:11:48]

The superclass' browser() is not virtual, and if I want to make
MediaRouterBaseBrowserTest::browser() virtual so that it can be overridden by
the incognito class, I need to define it here like this. Maybe there is a better
way to do this?

[mark a. foltz, 2017/02/15 00:41:27]

It's a little weird to override a non-virtual method with a virtual one.  But I
guess it's legal, and the style guide doesn't prohibit it, so I guess it's okay.
 Please add a note explaining why you're doing this.

[takumif, 2017/02/18 20:44:05]

Done.

 }
 
 }  // namespace media_router