summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 17:15:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 17:15:28 +0000
commit71d504f2410920009ce8429eb8d4e7d19db70707 (patch)
treeef0f58c9e69d715f968c21e8c07e623309c2a4e9 /ash/shell
parent5d96bbe5e4dca8d2282a29fa0c4911314733dee5 (diff)
downloadchromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.zip
chromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.tar.gz
chromium_src-71d504f2410920009ce8429eb8d4e7d19db70707.tar.bz2
Move all the layout tests that ran under browser_tests to run under content_browsertests.
To support the new tests, I added new methods to create new normal/incognito windows in content_browsertests. BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10820007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/content_client/shell_browser_main_parts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 5c82bdf..9f4ad61 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -85,7 +85,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
}
void ShellBrowserMainParts::PreMainMessageLoopRun() {
- browser_context_.reset(new content::ShellBrowserContext);
+ browser_context_.reset(new content::ShellBrowserContext(false));
// A ViewsDelegate is required.
if (!views::ViewsDelegate::views_delegate)