InstantExtended: tests!

chrome/browser/instant/instant_controller.h

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 154 matching lines @@
   // Invoked by the InstantLoader when its RenderView crashes.
   void InstantLoaderRenderViewGone();
 
   // Invoked by InstantLoader when the instant page is about to navigate.
   void InstantLoaderAboutToNavigateMainFrame(const GURL& url);
 
   // Invoked by the InstantLoader when the instant page wants to navigate to
   // the speicfied URL.
   void NavigateToURL(const GURL& url, content::PageTransition transition);
 
+  // Call to force InstantController to enter testing mode. In particular, this
+  // doesn't force the instant page to be served over HTTPS.
+  //
+  // Only call from tests.
+  void SetTestingMode();

[sreeram, 2013/01/02 18:12:10]

I'd prefer instead to have the tests set --instant-url, which would also bypass
the HTTPS check. The general idea being to keep test-specific hooks as minimal
as possible; something like |in_testing_mode_| is too pervasive for my taste.

[samarth, 2013/01/02 23:35:15]

Ah yes, forget about that. I agree: that's much better.

We should probably still have at least one test that exercises the TemplateURL
path -- added such a test to the regular Instant tests.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
   FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
+  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
+  FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant);
 
   // Helper for OmniboxFocusChanged. Commit or discard the preview.
   void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
 
   // Creates a new loader if necessary, using the instant_url property of the
   // |template_url| (for example, if the Instant URL has changed since the last
   // time the loader was created). If |fallback_to_local| is true will use
   // kLocalOmniboxPopupURL as the fallback url (in extended mode) in case
   // the |template_url| doesn't have a valid Instant URL. Returns true if an
   // instant URL could be determined.
@@ skipping 46 matching lines @@
   chrome::BrowserInstantController* const browser_;
 
   // Whether the extended API and regular API are enabled. If both are false,
   // Instant is effectively disabled.
   const bool extended_enabled_;
   bool instant_enabled_;
 
   // If true, the instant URL is set to kLocalOmniboxPopupURL.
   const bool use_local_preview_only_;
 
+  // If true, we are being used in a test.
+  bool in_testing_mode_;
+
   // The state of the preview page, i.e., the page owned by |loader_|. Ignored
   // if |instant_tab_| is in use.
   InstantModel model_;
 
   // The preview WebContents.
   scoped_ptr<InstantLoader> loader_;
 
   // A committed WebContents that supports Instant. If non-NULL, the |loader_|
   // is guaranteed to be hidden and messages will be sent to this instead.
   scoped_ptr<InstantTab> instant_tab_;
@@ skipping 66 matching lines @@
 
   // Whether to allow the preview to show search suggestions. In general, the
   // preview is allowed to show search suggestions whenever |search_mode_| is
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_preview_to_show_search_suggestions_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_