Merge: Fix the filtering logic for x-chrome-manage-account header

chrome/browser/signin/signin_header_helper.cc

 // Copyright 2013 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 "chrome/browser/signin/signin_header_helper.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 243 matching lines @@
     int route_id) {
 #if defined(OS_IOS)
   NOTREACHED();
 #else
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!gaia::IsGaiaSignonRealm(request->url().GetOrigin()))
     return;
 
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
-  if (!(info && info->IsMainFrame() &&
-        (info->HasUserGesture() ||
-         !ui::PageTransitionIsWebTriggerable(info->GetPageTransition()))))
+  if (!(info && info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME))
     return;
 
   std::string header_value;
   if (!request->response_headers()->GetNormalizedHeader(
           kChromeManageAccountsHeader, &header_value)) {
     return;
   }
 
   DCHECK(switches::IsEnableAccountConsistency() && !io_data->IsOffTheRecord());
   ManageAccountsParams params(BuildManageAccountsParams(header_value));
   if (params.service_type == GAIA_SERVICE_TYPE_NONE)
     return;
 
   params.child_id = child_id;
   params.route_id = route_id;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params));
 #endif  // defined(OS_IOS)
 }
 
 } // namespace signin