Removed some GetActiveEntry references in autofill

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 570 matching lines @@
     const base::Callback<void(const FormStructure*)>& callback) {
   return AutofillDialogControllerImpl::Create(contents,
                                               form_structure,
                                               source_url,
                                               callback);
 }
 
 void AutofillDialogControllerImpl::Show() {
   dialog_shown_timestamp_ = base::Time::Now();
 
-  content::NavigationEntry* entry =
-      web_contents()->GetController().GetActiveEntry();
-  const GURL& active_url = entry ? entry->GetURL() : web_contents()->GetURL();
-  invoked_from_same_origin_ = active_url.GetOrigin() == source_url_.GetOrigin();
+  // Autocomplete is shown in response to a message from the renderer. As such,
+  // it can only be made in the context of the current document and we must use
+  // last committed URL for access checks.
+  const GURL& current_url = web_contents()->GetLastCommittedURL();
+  invoked_from_same_origin_ =
+      current_url.GetOrigin() == source_url_.GetOrigin();
 
   // Log any relevant UI metrics and security exceptions.
   GetMetricLogger().LogDialogUiEvent(AutofillMetrics::DIALOG_UI_SHOWN);
 
   GetMetricLogger().LogDialogSecurityMetric(
       AutofillMetrics::SECURITY_METRIC_DIALOG_SHOWN);
 
   // Determine what field types should be included in the dialog.
   // Note that RequestingCreditCardInfo() below relies on parsed field types.
   bool has_types = false;
@@ skipping 38 matching lines @@
 
   SuggestionsUpdated();
 
   int show_count =
       profile_->GetPrefs()->GetInteger(::prefs::kAutofillDialogShowCount);
   profile_->GetPrefs()->SetInteger(::prefs::kAutofillDialogShowCount,
                                    show_count + 1);
 
   SubmitButtonDelayBegin();
 
-  if (account_chooser_model_.WalletIsSelected())

[Charlie Reis, 2013/11/16 19:13:16]

Is this a merge conflict?  I don't think you want to change this.

-    FetchWalletCookie();
-
   // TODO(estade): don't show the dialog if the site didn't specify the right
   // fields. First we must figure out what the "right" fields are.
   view_.reset(CreateView());
   view_->Show();
   GetManager()->AddObserver(this);
 
-  if (!account_chooser_model_.WalletIsSelected())
+  if (!account_chooser_model_.WalletIsSelected()) {
     LogDialogLatencyToShow();
+  } else {

[Charlie Reis, 2013/11/16 19:13:16]

Another merge conflict?

+    // TODO(aruslan): UMA metrics for sign-in.
+    FetchWalletCookie();
+  }
 }
 
 void AutofillDialogControllerImpl::Hide() {
   if (view_)
     view_->Hide();
 }
 
 void AutofillDialogControllerImpl::TabActivated() {
   // If the user switched away from this tab and then switched back, reload the
   // Wallet items, in case they've changed.
@@ skipping 2848 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill