Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/public/test/content_browser_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/content_browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/pattern.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"

[Avi (use Gerrit), 2016/06/09 02:11:17]

It didn't occur to me that we had this dependency. :O

[ncarter (slow), 2016/06/09 16:24:07]

It's legit. Only content_browsertests (and component browsertests that are
content-shell based) are supposed to include this file. 

The matrix of "what utils #includes are allowed where" is pretty
testwriter-unfriendly, IMO:

  test_utils
  browser_test_utils
  content_browser_test_utils
  content_test_utils
  content_browser_test_utils_internal

I kind of wish we would just #include the allowed util files from
browser_test_base.h and content_browser_test.h or something like that, IWYU be
damned. The approach I'm switching to makes this scenario worse, because using
ToRenderFrameHost with an FTN requires you to have included the right file for
the FTN variant of ConvertToRenderFrameHost.

 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 #include "net/base/filename_util.h"
 
 namespace content {
 
 base::FilePath GetTestFilePath(const char* dir, const char* file) {
   base::FilePath path;
   PathService::Get(DIR_TEST_DATA, &path);
   return path.Append(base::FilePath().AppendASCII(dir).Append(
       base::FilePath().AppendASCII(file)));
@@ skipping 66 matching lines @@
 void WaitForAppModalDialog(Shell* window) {
   ShellJavaScriptDialogManager* dialog_manager =
       static_cast<ShellJavaScriptDialogManager*>(
           window->GetJavaScriptDialogManager(window->web_contents()));
 
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner();
   dialog_manager->set_dialog_request_callback(runner->QuitClosure());
   runner->Run();
 }
 
+RenderFrameHost* ConvertToRenderFrameHost(Shell* shell) {
+  return shell->web_contents()->GetMainFrame();
+}
+
 ShellAddedObserver::ShellAddedObserver()
     : shell_(NULL) {
   Shell::SetShellCreatedCallback(
       base::Bind(&ShellAddedObserver::ShellCreated, base::Unretained(this)));
 }
 
 ShellAddedObserver::~ShellAddedObserver() {
 }
 
 Shell* ShellAddedObserver::GetShell() {
@@ skipping 34 matching lines @@
 
   std::string ascii_message = base::UTF16ToASCII(message);
   if (base::MatchPattern(ascii_message, filter_)) {
     message_ = ascii_message;
     message_loop_runner_->Quit();
   }
   return false;
 }
 
 }  // namespace content