| Index: chrome/browser/search/instant_unittest_base.cc
|
| diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc
|
| index 31b4291ff9cf45af59a30e428c55def5123f38e1..e676334c0a176485b45ae6b39ddc52f1766db577 100644
|
| --- a/chrome/browser/search/instant_unittest_base.cc
|
| +++ b/chrome/browser/search/instant_unittest_base.cc
|
| @@ -20,12 +20,31 @@
|
| #include "chrome/test/base/browser_with_test_window_test.h"
|
| #include "chrome/test/base/testing_pref_service_syncable.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| +#include "components/variations/entropy_provider.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_source.h"
|
|
|
| +InstantUnitTestBase::InstantUnitTestBase() {
|
| + field_trial_list_.reset(new base::FieldTrialList(
|
| + new metrics::SHA1EntropyProvider("42")));
|
| +}
|
| +
|
| +InstantUnitTestBase::~InstantUnitTestBase() {
|
| +}
|
| +
|
| void InstantUnitTestBase::SetUp() {
|
| - chrome::EnableInstantExtendedAPIForTesting();
|
| + SetUpHelper();
|
| +}
|
| +
|
| +void InstantUnitTestBase::SetUpWithoutCacheableNTP() {
|
| + ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
|
| + "InstantExtended", "Group1 use_cacheable_ntp:0"));
|
| + SetUpHelper();
|
| +}
|
| +
|
| +void InstantUnitTestBase::SetUpHelper() {
|
| + chrome::EnableQueryExtractionForTesting();
|
| BrowserWithTestWindowTest::SetUp();
|
|
|
| TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
|
|
|