Add a new field trial for Instant.

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/instant/instant_controller.h"
@@ skipping 188 matching lines @@
 
   const string16& GetSuggestion() const {
     return browser()->instant()->loader_->complete_suggested_text_;
   }
 
   GURL GetCurrentURL() {
     return browser()->instant()->loader_.get() ?
         browser()->instant()->loader_.get()->url() : GURL();
   }
 
+  bool LoaderIsReady() const {
+    return browser()->instant()->loader_->ready();
+  }
+
+  const string16& GetUserText() const {
+    return browser()->instant()->loader_->user_text();
+  }
+
   void SendKey(ui::KeyboardCode key) {
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
         browser(), key, false, false, false, false));
   }
 
   void SetSuggestionsJavascriptArgument(TabContents* tab_contents,
                                         const std::string& argument) {
     std::string script = StringPrintf(
         "window.setSuggestionsArgument = %s;", argument.c_str());
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
@@ skipping 741 matching lines @@
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16("def"));
 
   // Check that instant is active, but the preview is not showing.
   EXPECT_TRUE(HasPreview());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(browser()->instant()->IsCurrent());
 
   TabContentsWrapper* tab_contents = browser()->instant()->GetPreviewContents();
   EXPECT_TRUE(tab_contents);
 
+  // Wait for the underlying loader to finish processing.
+  WaitForMessageToBeProcessedByRenderer(tab_contents);
+
+  EXPECT_STR_EQ("def", location_bar_->location_entry()->GetText());
+  EXPECT_STR_EQ("defghi", GetUserText());
+  EXPECT_TRUE(LoaderIsReady());
+
   // Press <Enter> in the omnibox, causing the preview to be committed.
   SendKey(ui::VKEY_RETURN);
 
+  // The preview contents should now be the active tab contents.
+  EXPECT_FALSE(browser()->instant()->GetPreviewContents());
+  EXPECT_FALSE(HasPreview());
+  EXPECT_FALSE(browser()->instant()->is_displayable());
+  EXPECT_FALSE(browser()->instant()->IsCurrent());
+  EXPECT_EQ(tab_contents, browser()->GetSelectedTabContentsWrapper());
+}
+
+// Tests the SILENT experiment of the field trial.
+class InstantFieldTrialSilentTest : public InstantTest {
+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitchASCII(switches::kInstantFieldTrial,
+                                    switches::kInstantFieldTrialSilent);
+  }
+};
+
+// Tests that instant is active, even without calling EnableInstant().
+IN_PROC_BROWSER_TEST_F(InstantFieldTrialSilentTest, MAYBE_ExperimentEnabled) {
+  // Check that instant is enabled, despite not setting the preference.
+  Profile* profile = browser()->profile();
+  EXPECT_FALSE(profile->GetPrefs()->GetBoolean(prefs::kInstantEnabled));
+  EXPECT_TRUE(InstantController::IsEnabled(profile));
+
+  ASSERT_TRUE(test_server()->Start());
+  SetupInstantProvider("search.html");
+  ui_test_utils::WindowedNotificationObserver instant_support_observer(
+      chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
+  SetupLocationBar();
+  WaitForPreviewToNavigate();
+  instant_support_observer.Wait();
+
+  // Type into the omnibox, but don't press <Enter> yet.
+  location_bar_->location_entry()->SetUserText(UTF8ToUTF16("def"));
+
+  // Check that instant is active, but the preview is not showing.
+  EXPECT_TRUE(HasPreview());
+  EXPECT_FALSE(browser()->instant()->is_displayable());
+  EXPECT_FALSE(browser()->instant()->IsCurrent());
+
+  TabContentsWrapper* tab_contents = browser()->instant()->GetPreviewContents();
+  EXPECT_TRUE(tab_contents);
+
+  // Wait for the underlying loader to finish processing.
+  WaitForMessageToBeProcessedByRenderer(tab_contents);
+
+  EXPECT_STR_EQ("def", location_bar_->location_entry()->GetText());
+  EXPECT_STR_EQ("", GetUserText());
+  EXPECT_FALSE(LoaderIsReady());
+
+  // Press <Enter> in the omnibox, causing the preview to be committed.
+  SendKey(ui::VKEY_RETURN);
+
   // The preview contents should now be the active tab contents.
   EXPECT_FALSE(browser()->instant()->GetPreviewContents());
   EXPECT_FALSE(HasPreview());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(browser()->instant()->IsCurrent());
   EXPECT_EQ(tab_contents, browser()->GetSelectedTabContentsWrapper());
 }
 
-// Tests the SearchToNonSearch scenario under the HIDDEN field trial.
-IN_PROC_BROWSER_TEST_F(InstantFieldTrialHiddenTest, MAYBE_SearchToNonSearch) {
+// Tests the SearchToNonSearch scenario under the SILENT field trial.
+IN_PROC_BROWSER_TEST_F(InstantFieldTrialSilentTest, MAYBE_SearchToNonSearch) {
   ASSERT_TRUE(test_server()->Start());
   ui_test_utils::WindowedNotificationObserver instant_support_observer(
       chrome::NOTIFICATION_INSTANT_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   // Type in some search text.
   SetupInstantProvider("search.html");
   SetupLocationBar();
 
   // Load a non-search URL; don't wait for the preview to navigate.
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
 
   // Wait for the preview to navigate.
   WaitForPreviewToNavigate();
   instant_support_observer.Wait();
 
   // Instant should be active, but not displayable or committable.
   EXPECT_TRUE(HasPreview());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   EXPECT_FALSE(browser()->instant()->PrepareForCommit());
 }