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

Unified Diff: chrome/browser/instant/instant_test_utils.h

Issue 12114050: [Instant] Instant Extended tests for search term extraction. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: cleaner Created 7 years, 11 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/browser/instant/instant_test_utils.h
diff --git a/chrome/browser/instant/instant_test_utils.h b/chrome/browser/instant/instant_test_utils.h
index 7a1880a0393e0b6bf88ca818c947e5545028173e..61153a035c32dabfb1be0708b022d05505eba152 100644
--- a/chrome/browser/instant/instant_test_utils.h
+++ b/chrome/browser/instant/instant_test_utils.h
@@ -38,6 +38,15 @@ class InstantTestModelObserver : public InstantModelObserver {
};
class InstantTestBase : public InProcessBrowserTest {
+ public:
+ InstantTestBase() {
+ // Initialize (but not Start()) the test HTTPS server.
+ https_test_server_ = new net::TestServer(
sreeram 2013/02/01 22:03:24 You could make this an initializer: InstantTestBas
Mathieu 2013/02/04 20:37:36 Done.
+ net::TestServer::TYPE_HTTPS,
+ net::BaseTestServer::SSLOptions(),
+ FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+ }
+
protected:
void SetupInstant();
void SetupInstantUsingTemplateURL();
@@ -72,6 +81,9 @@ class InstantTestBase : public InProcessBrowserTest {
bool expected) WARN_UNUSED_RESULT;
GURL instant_url_;
+
+ // HTTPS Testing server, started on demand.
+ net::TestServer* https_test_server_;
};
#endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_

Powered by Google App Engine
This is Rietveld 408576698