Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8978)

Unified Diff: chrome_frame/test/test_with_web_server.h

Issue 10007043: Attempt to fix ChromeFrameTestWithWebServer tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/test/test_with_web_server.h
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index 7202ca22bfb1f4fc3028523440ed32673cfb2a28..454275371e2a4ee8790285edd6da2435748bf351 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -123,6 +123,11 @@ class MockWebServer : public test_server::HTTPTestServer {
void HandlePostedResponse(test_server::ConfigurableConnection* connection,
const test_server::Request& request);
+ void ClearResults() {
+ posted_result_.clear();
+ expected_result_.clear();
+ }
+
void set_expected_result(const std::string& expected_result) {
expected_result_ = expected_result;
}
@@ -178,6 +183,14 @@ class ChromeFrameTestWithWebServer : public testing::Test {
return test_file_path_;
}
+ static chrome_frame_test::TimedMsgLoop& loop() {
+ return *loop_;
+ }
+
+ static testing::StrictMock<MockWebServer>& server_mock() {
+ return *server_mock_;
+ }
+
static void SetUpTestCase();
static void TearDownTestCase();
@@ -196,10 +209,12 @@ class ChromeFrameTestWithWebServer : public testing::Test {
// The user data directory used for Chrome instances.
static ScopedTempDir temp_dir_;
+ // The web server from which we serve the web!
+ static chrome_frame_test::TimedMsgLoop* loop_;
+ static testing::StrictMock<MockWebServer>* server_mock_;
+
BrowserKind browser_;
base::win::ScopedHandle browser_handle_;
- chrome_frame_test::TimedMsgLoop loop_;
- testing::StrictMock<MockWebServer> server_mock_;
};
// A helper class for doing some bookkeeping when using the

Powered by Google App Engine
This is Rietveld 408576698