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

Unified Diff: chrome/browser/ui/search/instant_test_utils.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused. Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.h ('k') | chrome/browser/ui/search/local_ntp_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_test_utils.cc
diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc
index c576e37791ff4bbdbbeac9d9e2bb30bf08c89e2d..bf698ee07678ed3385d1bb7b08d5737bf8e70bb6 100644
--- a/chrome/browser/ui/search/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -20,6 +20,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/variations/entropy_provider.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
@@ -36,8 +37,23 @@ std::string WrapScript(const std::string& script) {
// InstantTestBase -----------------------------------------------------------
+InstantTestBase::InstantTestBase()
+ : https_test_server_(
+ net::SpawnedTestServer::TYPE_HTTPS,
+ net::BaseTestServer::SSLOptions(),
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
+ init_suggestions_url_(false) {
+}
+
+InstantTestBase::~InstantTestBase() {}
+
void InstantTestBase::SetupInstant(Browser* browser) {
browser_ = browser;
+
+ // TODO(samarth): update tests to work with cacheable NTP and remove this.
+ ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+ "InstantExtended", "Group1 use_cacheable_ntp:0"));
+
TemplateURLService* service =
TemplateURLServiceFactory::GetForProfile(browser_->profile());
ui_test_utils::WaitForTemplateURLServiceToLoad(service);
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.h ('k') | chrome/browser/ui/search/local_ntp_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698