Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / search / instant_service_unittest.cc

diff --git a/src/chrome/browser/search/instant_service_unittest.cc b/src/chrome/browser/search/instant_service_unittest.cc
index f681c60..bacd7ae 100644 (file)
--- a/src/chrome/browser/search/instant_service_unittest.cc
+++ b/src/chrome/browser/search/instant_service_unittest.cc
@@ -34,14 +34,14 @@ class MockInstantServiceObserver : public InstantServiceObserver {
 
 class InstantServiceTest : public InstantUnitTestBase {
  protected:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     InstantUnitTestBase::SetUp();
 
     instant_service_observer_.reset(new MockInstantServiceObserver());
     instant_service_->AddObserver(instant_service_observer_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     instant_service_->RemoveObserver(instant_service_observer_.get());
     InstantUnitTestBase::TearDown();
   }
@@ -59,9 +59,9 @@ class InstantServiceTest : public InstantUnitTestBase {
 
 class InstantServiceEnabledTest : public InstantServiceTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-        "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
+        "EmbeddedSearch", "Group1 use_cacheable_ntp:1"));
     InstantServiceTest::SetUp();
   }
 };
@@ -116,10 +116,8 @@ TEST_F(InstantServiceEnabledTest, SendsSearchURLsToRenderer) {
   EXPECT_EQ("https://www.google.com/newtab", new_tab_page_url.spec());
 }
 
-TEST_F(InstantServiceTest, InstantSearchDisabled) {
-  // 'prefetch_results' flag is not enabled in field trials. Make sure
-  // InstantSearchPrerenderer is not initialized.
-  EXPECT_EQ(static_cast<InstantSearchPrerenderer*>(NULL),
+TEST_F(InstantServiceTest, InstantSearchEnabled) {
+  EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL),
             GetInstantSearchPrerenderer());
 }