[content shell] W3C SVG tests need to run in a smaller window

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/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/shell/shell_browser_main_parts.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_javascript_dialog_creator.h"
 #include "content/shell/shell_messages.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_controller.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_;
 
@@ skipping 71 matching lines @@
       return windows_[i];
     }
   }
   return NULL;
 }
 
 Shell* Shell::CreateNewWindow(BrowserContext* browser_context,
                               const GURL& url,
                               SiteInstance* site_instance,
                               int routing_id,
-                              WebContents* base_web_contents) {
+                              const gfx::Size& initial_size) {
   WebContents::CreateParams create_params(browser_context, site_instance);
   create_params.routing_id = routing_id;
-  if (base_web_contents) {
-    create_params.initial_size =
-        base_web_contents->GetView()->GetContainerSize();
-  } else {
+  if (!initial_size.IsEmpty())
+    create_params.initial_size = initial_size;
+  else
     create_params.initial_size = gfx::Size(kTestWindowWidth, kTestWindowHeight);
-  }
   WebContents* web_contents = WebContents::Create(create_params);
   Shell* shell = CreateShell(web_contents);
   if (!url.is_empty())
     shell->LoadURL(url);
   return shell;
 }
 
 void Shell::LoadURL(const GURL& url) {
   web_contents_->GetController().LoadURL(
       url,
@@ skipping 35 matching lines @@
   }
   ShellContentBrowserClient* browser_client =
       static_cast<ShellContentBrowserClient*>(
           GetContentClient()->browser());
   ShellDevToolsDelegate* delegate =
       browser_client->shell_browser_main_parts()->devtools_delegate();
   GURL url = delegate->devtools_http_handler()->GetFrontendURL(
       DevToolsAgentHost::GetFor(web_contents()->GetRenderViewHost()));
   dev_tools_ = CreateNewWindow(
       web_contents()->GetBrowserContext(),
-      url, NULL, MSG_ROUTING_NONE, NULL);
+      url, NULL, MSG_ROUTING_NONE, gfx::Size());
 }
 
 void Shell::CloseDevTools() {
   if (!dev_tools_)
     return;
   dev_tools_->Close();
   dev_tools_ = NULL;
 }
 
 gfx::NativeView Shell::GetContentView() {
@@ skipping 102 matching lines @@
         Details<std::pair<NavigationEntry*, bool> >(details).ptr();
 
     if (title->first) {
       string16 text = title->first->GetTitle();
       PlatformSetTitle(text);
     }
   }
 }
 
 }  // namespace content