Remove unused / unnecessary stuff from Instant.

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2012 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/stringprintf.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_model.h"
@@ skipping 36 matching lines @@
 
   // InstantModelObserver overrides:
   virtual void DisplayStateChanged(const InstantModel& model) OVERRIDE {
     run_loop_.Quit();
   }
 
  private:
   const InstantModel* const model_;
   base::RunLoop run_loop_;
 
-  DISALLOW_IMPLICIT_CONSTRUCTORS(InstantTestModelObserver);
+  DISALLOW_COPY_AND_ASSIGN(InstantTestModelObserver);
 };
 
 class InstantTest : public InProcessBrowserTest {
  protected:
   void SetupInstant(const std::string& page) {
     ASSERT_TRUE(test_server()->Start());
 
     TemplateURLService* service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ui_test_utils::WaitForTemplateURLServiceToLoad(service);
@@ skipping 363 matching lines @@
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
 
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), text);
   EXPECT_EQ(ASCIIToUTF16(" suggestion"), text.substr(start, end - start));
   EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());
 }
 
-#if defined(OS_MACOSX)
-// The "delayed" completion behavior is not implemented on the Mac. Strange.
-#define MAYBE_SuggestionIsCompletedDelayed DISABLED_SuggestionIsCompletedDelayed
-#else
-#define MAYBE_SuggestionIsCompletedDelayed SuggestionIsCompletedDelayed
-#endif
-// Test that the INSTANT_COMPLETE_DELAYED behavior works as expected.
-IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SuggestionIsCompletedDelayed) {
-  ASSERT_NO_FATAL_FAILURE(SetupInstant("instant.html"));
-  FocusOmniboxAndWaitForInstantSupport();
-
-  // Tell the JS to request the given behavior.
-  EXPECT_TRUE(ExecuteScript("behavior = 'delayed'"));
-
-  // Type a query, causing the hardcoded "query suggestion" to be returned.
-  SetOmniboxTextAndWaitForInstantToShow("query");
-
-  content::WindowedNotificationObserver instant_updated_observer(
-      chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
-      content::NotificationService::AllSources());
-
-  // Get what's showing in the omnibox, and what's highlighted.
-  string16 text = omnibox()->GetText();
-  size_t start = 0, end = 0;
-  omnibox()->GetSelectionBounds(&start, &end);
-  if (start > end)
-    std::swap(start, end);
-
-  EXPECT_EQ(ASCIIToUTF16("query"), text);
-  EXPECT_EQ(ASCIIToUTF16(""), text.substr(start, end - start));
-  EXPECT_EQ(ASCIIToUTF16(" suggestion"), omnibox()->GetInstantSuggestion());
-
-  // Wait for the animation to complete, which causes the omnibox to update.
-  instant_updated_observer.Wait();
-
-  text = omnibox()->GetText();
-  omnibox()->GetSelectionBounds(&start, &end);
-  if (start > end)
-    std::swap(start, end);
-
-  EXPECT_EQ(ASCIIToUTF16("query suggestion"), text);
-  EXPECT_EQ(ASCIIToUTF16(" suggestion"), text.substr(start, end - start));
-  EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());
-}
-
 // Test that the INSTANT_COMPLETE_NEVER behavior works as expected.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsCompletedNever) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant("instant.html"));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Tell the JS to request the given behavior.
   EXPECT_TRUE(ExecuteScript("behavior = 'never'"));
 
   // Type a query, causing the hardcoded "query suggestion" to be returned.
   SetOmniboxTextAndWaitForInstantToShow("query");
@@ skipping 469 matching lines @@
   // Check that a d with a dot above and below it is completed regardless of
   // how that is encoded.
   // U+1E0D = LATIN SMALL LETTER D WITH DOT BELOW
   // U+1E0B = LATIN SMALL LETTER D WITH DOT ABOVE
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: '\\u1e0d\\u0307oh' } ]"));
 
   instant()->Hide();
   SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"\u1e0b\u0323"));
   EXPECT_EQ(WideToUTF16(L"\u1e0b\u0323oh"), omnibox()->GetText());
 }