[Search] Identity check for New Tab Page should use canonicalized form

chrome/browser/ui/search/search_tab_helper.cc

 // 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.
 
 #include "chrome/browser/ui/search/search_tab_helper.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 28 matching lines @@
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_type.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 #include "net/base/net_errors.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchTabHelper);
 
 namespace {
 
 // For reporting Cacheable NTP navigations.
@@ skipping 497 matching lines @@
   omnibox->OnBeforePossibleChange();
   omnibox->model()->OnPaste();
   omnibox->SetUserText(text_to_paste);
   omnibox->OnAfterPossibleChange();
 #endif
 }
 
 void SearchTabHelper::OnChromeIdentityCheck(const base::string16& identity) {
   SigninManagerBase* manager = SigninManagerFactory::GetForProfile(profile());
   if (manager) {
-    const base::string16 username =
-        base::UTF8ToUTF16(manager->GetAuthenticatedUsername());
-    ipc_router_.SendChromeIdentityCheckResult(identity, identity == username);
+    ipc_router_.SendChromeIdentityCheckResult(
+        identity, gaia::AreEmailsSame(base::UTF16ToUTF8(identity),
+                                      manager->GetAuthenticatedUsername()));
   } else {
     ipc_router_.SendChromeIdentityCheckResult(identity, false);
   }
 }
 
 void SearchTabHelper::OnHistorySyncCheck() {
   ipc_router_.SendHistorySyncCheckResult(IsHistorySyncEnabled(profile()));
 }
 
 void SearchTabHelper::UpdateMode(bool update_origin, bool is_preloaded_ntp) {
@@ skipping 52 matching lines @@
 
 bool SearchTabHelper::IsInputInProgress() const {
   OmniboxView* omnibox = GetOmniboxView();
   return !model_.mode().is_ntp() && omnibox &&
       omnibox->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
 }
 
 OmniboxView* SearchTabHelper::GetOmniboxView() const {
   return delegate_ ? delegate_->GetOmniboxView() : NULL;
 }