Makes it so that loads originating from instant never show auth

dialogs. This restriction is imposed by not being able to merge tab
contents with a pending navigation (auth dialogs result in a pending
navigation until the user authenticates).

BUG=89439
TEST=with instant enabled try a page that loads an auth dialog, make
sure you only see the dialog when you press enter.
R=cbentzel@chromium.org,jam@chromium.org

Review URL: http://codereview.chromium.org/7848007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100142 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/instant/instant_loader.cc

@@ -58,12 +58,13 @@ const int kUpdateBoundsDelayMS = 1000;
 // If this status code is seen instant is disabled for the specified host.
 const int kHostBlacklistStatusCode = 403;
 
-// Header and value set for all loads.
-const char kPreviewHeader[] = "X-Purpose";
-const char kPreviewHeaderValue[] = "instant";
-
 }  // namespace
 
+// static
+const char* const InstantLoader::kInstantHeader = "X-Purpose";
+// static
+const char* const InstantLoader::kInstantHeaderValue = "instant";
+
 // FrameLoadObserver is responsible for determining if the page supports
 // instant after it has loaded.
 class InstantLoader::FrameLoadObserver : public NotificationObserver {
@@ -416,7 +417,7 @@ void InstantLoader::TabContentsDelegateImpl::NavigationStateChanged(
 void InstantLoader::TabContentsDelegateImpl::AddNavigationHeaders(
     const GURL& url,
     std::string* headers) {
-  net::HttpUtil::AppendHeaderIfMissing(kPreviewHeader, kPreviewHeaderValue,
+  net::HttpUtil::AppendHeaderIfMissing(kInstantHeader, kInstantHeaderValue,
                                        headers);
 }
 

chrome/browser/instant/instant_loader.h

@@ -37,6 +37,10 @@ class TemplateURL;
 // loaded as is.
 class InstantLoader : public NotificationObserver {
  public:
+  // Header and value set on loads that originate from instant.
+  static const char* const kInstantHeader;
+  static const char* const kInstantHeaderValue;
+
   InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id);
   virtual ~InstantLoader();
 

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/download/download_throttling_resource_handler.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
+#include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/net/load_timing_observer.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
@@ -40,6 +41,22 @@
 
 namespace {
 
+// Empty ResourceDispatcherHostLoginDelegate implementation used for instant.
+// Auth navigations don't commit the load (the load remains pending) until the
+// user cancels or succeeds in authorizing. Since we don't allow merging of
+// TabContents with pending loads we disallow auth dialogs from showing during
+// instant. This empty ResourceDispatcherHostLoginDelegate implementation does
+// that.
+// TODO: see if we can handle this case more robustly.
+class InstantResourceDispatcherHostLoginDelegate :
+    public ResourceDispatcherHostLoginDelegate {
+ public:
+  InstantResourceDispatcherHostLoginDelegate() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InstantResourceDispatcherHostLoginDelegate);
+};
+
 void AddPrerenderOnUI(
     const base::Callback<prerender::PrerenderManager*(void)>&
         prerender_manager_getter,
@@ -257,6 +274,11 @@ bool ChromeResourceDispatcherHostDelegate::AcceptAuthRequest(
 ResourceDispatcherHostLoginDelegate*
     ChromeResourceDispatcherHostDelegate::CreateLoginDelegate(
         net::AuthChallengeInfo* auth_info, net::URLRequest* request) {
+  std::string instant_header_value;
+  if (request->extra_request_headers().GetHeader(
+          InstantLoader::kInstantHeader, &instant_header_value) &&
+      instant_header_value == InstantLoader::kInstantHeaderValue)
+    return new InstantResourceDispatcherHostLoginDelegate;
   return CreateLoginPrompt(auth_info, request);
 }