diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 20:33:55 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 20:33:55 +0000 |
commit | 9a47c43dbca36a37f2d237f644398e64ee9eaad0 (patch) | |
tree | e0ad9a572612c1775383aee39585e0e746063a7c /chrome_frame | |
parent | bb0830b9d30f3ff758717f5c2d5c4607248de2d2 (diff) | |
download | chromium_src-9a47c43dbca36a37f2d237f644398e64ee9eaad0.zip chromium_src-9a47c43dbca36a37f2d237f644398e64ee9eaad0.tar.gz chromium_src-9a47c43dbca36a37f2d237f644398e64ee9eaad0.tar.bz2 |
Extract locking behaviour from ProcessSingleton.
This refactoring continues the division of the behaviour of ProcessSingleton into two parts:
* The protocol for establishing a server process and communicating between the client and server.
* How the server processes command-line invocations.
Very small behavioural change:
* If an error occurs while parsing the command-line received via COPY_DATA, the modal dialog (if any) is no longer flashed and raised to foreground.
The motivation for this change is that I wish to introduce some more sophisticated behaviour when queuing messages during startup. See the follow-up CL (in-progress) at https://codereview.chromium.org/12674028/ .
BUG=170726,170734,225693
Review URL: https://chromiumcodereview.appspot.com/12096114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index d46021d..9f2c2eae 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -791,7 +791,6 @@ int CFUrlRequestUnittestRunner::PreCreateThreads() { base::Unretained(this))); process_singleton_.reset(new ProcessSingleton(fake_chrome_->user_data(), callback)); - process_singleton_->Lock(NULL); return 0; } @@ -822,8 +821,6 @@ void CFUrlRequestUnittestRunner::PreMainMessageLoopRun() { base::KillProcess(crash_service_, 0, false); ::ExitProcess(1); } - - StartChromeFrameInHostBrowser(); } bool CFUrlRequestUnittestRunner::MainMessageLoopRun(int* result_code) { @@ -832,7 +829,7 @@ bool CFUrlRequestUnittestRunner::MainMessageLoopRun(int* result_code) { // We need to allow IO on the main thread for these tests. base::ThreadRestrictions::SetIOAllowed(true); - process_singleton_->Unlock(); + StartChromeFrameInHostBrowser(); StartInitializationTimeout(); return false; } |