summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_unittest.h
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 23:49:30 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-21 23:49:30 +0000
commit6412d3264acd71864fc82ce968fb78d1d1ce1d7e (patch)
treeadfc60fc74559126bc4394df4e0298a6eec4baf1 /net/url_request/url_request_unittest.h
parent0dcb16bc3f6baf94d9b87a8685bc8309127018ad (diff)
downloadchromium_src-6412d3264acd71864fc82ce968fb78d1d1ce1d7e.zip
chromium_src-6412d3264acd71864fc82ce968fb78d1d1ce1d7e.tar.gz
chromium_src-6412d3264acd71864fc82ce968fb78d1d1ce1d7e.tar.bz2
Don't crash if test server was not started.
Code from phajdan.jr@gmail.com. Review URL: http://codereview.chromium.org/11367 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_unittest.h')
-rw-r--r--net/url_request/url_request_unittest.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 72e9c01..624fb6f 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -237,6 +237,8 @@ class TestServer : public base::ProcessFilter {
return d.did_succeed();
}
+ bool init_successful() const { return init_successful_; }
+
protected:
struct ManualInit {};
@@ -245,6 +247,7 @@ class TestServer : public base::ProcessFilter {
// its constructor).
TestServer(ManualInit)
: process_handle_(NULL),
+ init_successful_(false),
is_shutdown_(true) {
}
@@ -323,6 +326,7 @@ class TestServer : public base::ProcessFilter {
}
ASSERT_TRUE(success) << "Webserver not starting properly. (On Linux, you need to install third_party/tlslite.)";
+ init_successful_ = true;
is_shutdown_ = false;
}
@@ -393,6 +397,7 @@ class TestServer : public base::ProcessFilter {
std::string base_address_;
std::wstring python_runtime_;
base::ProcessHandle process_handle_;
+ bool init_successful_;
bool is_shutdown_;
};