diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:10:04 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:10:04 +0000 |
| commit | 48493b705a0d59a34fb2b702aa7c0b6a24258a7f (patch) | |
| tree | 6a5aa4fa3b3a108c0ae88032015df13c632b9960 /chrome_frame | |
| parent | 7ccc2f1ef77e082ded4d5e1ce04f5005313202de (diff) | |
| download | chromium_src-48493b705a0d59a34fb2b702aa7c0b6a24258a7f.zip chromium_src-48493b705a0d59a34fb2b702aa7c0b6a24258a7f.tar.gz chromium_src-48493b705a0d59a34fb2b702aa7c0b6a24258a7f.tar.bz2 | |
Merge 120186 - Fix attrition experiment toast regression due to startup refactoring.
Make sure early return from PreCreateThreads aborts the startup sequence.
BUG=110671
TEST=Launch Chrome with --try-chrome-again=0, select "Dont bug me" and Chrome should not launch.
Review URL: https://chromiumcodereview.appspot.com/9150033
TBR=finnur@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9372026
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@121240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 3 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 3ebc4a5f..d81a2a2 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -613,7 +613,7 @@ void CFUrlRequestUnittestRunner::PreEarlyInitialization() { FilterDisabledTests(); } -void CFUrlRequestUnittestRunner::PreCreateThreads() { +int CFUrlRequestUnittestRunner::PreCreateThreads() { fake_chrome_.reset(new FakeExternalTab()); fake_chrome_->Initialize(); fake_chrome_->browser_process()->PreCreateThreads(); @@ -621,6 +621,7 @@ void CFUrlRequestUnittestRunner::PreCreateThreads() { pss_subclass_.reset(new ProcessSingletonSubclass(this)); EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_->user_data())); StartChromeFrameInHostBrowser(); + return 0; } void CFUrlRequestUnittestRunner::PreMainMessageLoopRun() { diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index 8a1a190..0ed4f78 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -104,7 +104,7 @@ class CFUrlRequestUnittestRunner virtual void PreMainMessageLoopStart() OVERRIDE {} virtual void PostMainMessageLoopStart() OVERRIDE {} virtual void ToolkitInitialized() OVERRIDE {} - virtual void PreCreateThreads() OVERRIDE; + virtual int PreCreateThreads() OVERRIDE; virtual void PreMainMessageLoopRun() OVERRIDE; virtual bool MainMessageLoopRun(int* result_code) OVERRIDE; virtual void PostMainMessageLoopRun() OVERRIDE; |