Port the render_view_host_manager_browsertest.cc to content_browsertests.

content/shell/shell.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/shell/shell.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
 #include "content/shell/shell_switches.h"
 #include "ui/gfx/size.h"
 
 // Content area size for newly created windows.
 static const int kTestWindowWidth = 800;
 static const int kTestWindowHeight = 600;
 
 namespace content {
 
 std::vector<Shell*> Shell::windows_;
+base::Callback<void(Shell*)> Shell::shell_created_callback_;
 
 bool Shell::quit_message_loop_ = true;
 
 Shell::Shell(WebContents* web_contents)
     : window_(NULL),
       url_edit_view_(NULL)
 #if defined(OS_WIN) && !defined(USE_AURA)
       , default_edit_wnd_proc_(0)
 #endif
   {

[Charlie Reis, 2012/07/30 16:40:01]

This macro makes for an odd indent situation.  I'm ok either way, but should the
open brace be at zero indent in this case?

[jam, 2012/07/30 17:03:50]

I'm not sure what's recommended in this case. when macros are used like this,
tabbing (and location of commas etc) usually doesn't/can't confirm to the style
guide.

-    registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
-        Source<WebContents>(web_contents));
-    windows_.push_back(this);
+  registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
+      Source<WebContents>(web_contents));
+  windows_.push_back(this);
+
+  if (!shell_created_callback_.is_null()) {
+    shell_created_callback_.Run(this);
+    shell_created_callback_.Reset();
+  }
 }
 
 Shell::~Shell() {
   PlatformCleanUp();
 
   for (size_t i = 0; i < windows_.size(); ++i) {
     if (windows_[i] == this) {
       windows_.erase(windows_.begin() + i);
       break;
     }
@@ skipping 17 matching lines @@
 }
 
 void Shell::CloseAllWindows() {
   AutoReset<bool> auto_reset(&quit_message_loop_, false);
   std::vector<Shell*> open_windows(windows_);
   for (size_t i = 0; i < open_windows.size(); ++i)
     open_windows[i]->Close();
   MessageLoop::current()->RunAllPending();
 }
 
+void Shell::SetShellCreatedCallback(
+    base::Callback<void(Shell*)> shell_created_callback) {
+  DCHECK(shell_created_callback_.is_null());
+  shell_created_callback_ = shell_created_callback;
+}
+
 Shell* Shell::FromRenderViewHost(RenderViewHost* rvh) {
   for (size_t i = 0; i < windows_.size(); ++i) {
     if (windows_[i]->web_contents() &&
         windows_[i]->web_contents()->GetRenderViewHost() == rvh) {
       return windows_[i];
     }
   }
   return NULL;
 }
 
@@ skipping 46 matching lines @@
   PlatformEnableUIControl(FORWARD_BUTTON, current_index < max_index);
   PlatformEnableUIControl(STOP_BUTTON, web_contents_->IsLoading());
 }
 
 gfx::NativeView Shell::GetContentView() {
   if (!web_contents_.get())
     return NULL;
   return web_contents_->GetNativeView();
 }
 
+WebContents* Shell::OpenURLFromTab(WebContents* source,
+                                   const OpenURLParams& params) {
+  // The only one we implement for now.
+  DCHECK(params.disposition == CURRENT_TAB);
+  source->GetController().LoadURL(
+      params.url, params.referrer, params.transition, std::string());
+  return source;
+}
+
 void Shell::LoadingStateChanged(WebContents* source) {
   UpdateNavigationControls();
   PlatformSetIsLoading(source->IsLoading());
 }
 
+void Shell::CloseContents(WebContents* source) {
+  Close();
+}
+
 void Shell::WebContentsCreated(WebContents* source_contents,
                                int64 source_frame_id,
                                const GURL& target_url,
                                WebContents* new_contents) {
   CreateShell(new_contents);
 }
 
 void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) {
   PlatformSetAddressBarURL(web_contents->GetURL());
 }
@@ skipping 27 matching lines @@
         Details<std::pair<NavigationEntry*, bool> >(details).ptr();
 
     if (title->first) {
       string16 text = title->first->GetTitle();
       PlatformSetTitle(text);
     }
   }
 }
 
 }  // namespace content