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

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: fixes Created 7 years, 10 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..3fd40fd9a0e91c69253a751cf4d39ed43cab4f27 100644
--- a/chrome/browser/instant/instant_test_utils.h
+++ b/chrome/browser/instant/instant_test_utils.h
@@ -38,6 +38,14 @@ class InstantTestModelObserver : public InstantModelObserver {
};
class InstantTestBase : public InProcessBrowserTest {
+ public:
+ InstantTestBase()
+ : https_test_server_(new net::TestServer(
+ net::TestServer::TYPE_HTTPS,
+ net::BaseTestServer::SSLOptions(),
+ FilePath(FILE_PATH_LITERAL("chrome/test/data")))) {
+ }
+
protected:
void SetupInstant();
void SetupInstantUsingTemplateURL();
@@ -72,6 +80,9 @@ class InstantTestBase : public InProcessBrowserTest {
bool expected) WARN_UNUSED_RESULT;
GURL instant_url_;
+
+ // HTTPS Testing server, started on demand.
+ net::TestServer* const https_test_server_;
sreeram 2013/02/05 20:19:10 This should be scoped_ptr so that it gets freed co
sreeram 2013/02/05 20:38:24 In fact, why bother with scoped_ptr. Just make it
Mathieu 2013/02/05 20:43:00 Done. Thanks!
};
#endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_
« no previous file with comments | « chrome/browser/instant/instant_extended_browsertest.cc ('k') | chrome/browser/instant/instant_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698