Reland r242290, r241609, r242134.

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/command_line.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "net/http/http_response_headers.h"
@@ skipping 48 matching lines @@
      return;
    }
 
   // Only set the header for Gaia (in the mirror world) and Drive. Gaia needs
   // the header to redirect certain user actions to Chrome native UI. Drive
   // needs the header to tell if the current user is connected. The drive path
   // is a temporary workaround until the more generic chrome.principals API is
   // available.
   const GURL& url = redirect_url.is_empty() ? request->url() : redirect_url;
   GURL origin(url.GetOrigin());
-  bool is_gaia_signin = !switches::IsEnableInlineSignin() &&
+  bool is_gaia_origin = switches::IsEnableInlineSignin() &&
       switches::IsNewProfileManagement() &&
       gaia::IsGaiaSignonRealm(origin);
-  if (!is_gaia_signin && !IsDriveOrigin(origin))
+  if (!is_gaia_origin && !IsDriveOrigin(origin))
     return;
 
   ExtensionRendererState* renderer_state =
       ExtensionRendererState::GetInstance();
   ExtensionRendererState::WebViewInfo webview_info;
   bool is_guest = renderer_state->GetWebViewInfo(
       child_id, route_id, &webview_info);
   if (is_guest && webview_info.extension_id == kGaiaAuthExtensionID){
     return;
   }
@@ skipping 17 matching lines @@
       request->response_headers()->HasHeader(kChromeManageAccountsHeader)) {
     DCHECK(switches::IsNewProfileManagement() &&
            !io_data->is_incognito());
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(ShowAvatarBubbleUIThread, child_id, route_id));
   }
 }
 
 } // namespace signin