[content shell] change how the main render view is picked for layout tests

content/shell/webkit_test_runner.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/webkit_test_runner.h"
 
 #include <cmath>
 
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 126 matching lines @@
   // Only the expected PNGs for Mac have a valid alpha channel.
   MakeBitmapOpaque(snapshot);
 #endif
 
 }
 
 }  // namespace
 
 WebKitTestRunner::WebKitTestRunner(RenderView* render_view)
     : RenderViewObserver(render_view),
-      RenderViewObserverTracker<WebKitTestRunner>(render_view),
-      is_main_window_(false) {
+      RenderViewObserverTracker<WebKitTestRunner>(render_view) {
 }
 
 WebKitTestRunner::~WebKitTestRunner() {
-  if (is_main_window_)
-    ShellRenderProcessObserver::GetInstance()->SetMainWindow(NULL, this);
 }
 
 // WebTestDelegate  -----------------------------------------------------------
 
 void WebKitTestRunner::clearContextMenuData() {
   last_context_menu_data_.reset();
 }
 
 WebContextMenuData* WebKitTestRunner::lastContextMenuData() const {
   return last_context_menu_data_.get();
@@ skipping 88 matching lines @@
   last_context_menu_data_.reset(new WebContextMenuData(data));
 }
 
 bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestRunner, message)
     IPC_MESSAGE_HANDLER(ShellViewMsg_CaptureTextDump, OnCaptureTextDump)
     IPC_MESSAGE_HANDLER(ShellViewMsg_CaptureImageDump, OnCaptureImageDump)
     IPC_MESSAGE_HANDLER(ShellViewMsg_SetCurrentWorkingDirectory,
                         OnSetCurrentWorkingDirectory)
-    IPC_MESSAGE_HANDLER(ShellViewMsg_SetIsMainWindow, OnSetIsMainWindow)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 // Public methods - -----------------------------------------------------------
 
 void WebKitTestRunner::Display() {
   const WebSize& size = render_view()->GetWebView()->size();
@@ skipping 57 matching lines @@
   }
   Send(new ShellViewHostMsg_ImageDump(
       routing_id(), actual_pixel_hash, snapshot));
 }
 
 void WebKitTestRunner::OnSetCurrentWorkingDirectory(
     const FilePath& current_working_directory) {
   current_working_directory_ = current_working_directory;
 }
 
-void WebKitTestRunner::OnSetIsMainWindow() {
-  is_main_window_ = true;
-  ShellRenderProcessObserver::GetInstance()->SetMainWindow(render_view(), this);
-}
-
 SkCanvas* WebKitTestRunner::GetCanvas() {
   WebView* view = render_view()->GetWebView();
   const WebSize& size = view->size();
   float device_scale_factor = view->deviceScaleFactor();
   int width = std::ceil(device_scale_factor * size.width);
   int height = std::ceil(device_scale_factor * size.height);
 
   if (canvas_ &&
       canvas_->getDeviceSize().width() == width &&
       canvas_->getDeviceSize().height() == height) {
@@ skipping 46 matching lines @@
     PaintRect(rect);
   }
   CHECK(proxy_->paintRect().isEmpty());
 }
 
 void WebKitTestRunner::DisplayRepaintMask() {
   GetCanvas()->drawARGB(167, 0, 0, 0);
 }
 
 }  // namespace content