Makes copying text in the omnibox always use permanent text is the

chrome/browser/autocomplete/autocomplete_edit.cc

Index: chrome/browser/autocomplete/autocomplete_edit.cc
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 5cea1c01a1b2d8f375e02109b99bf22824fbac84..df2edff9572351f25419e20cc01e9d98c21c175d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -385,32 +385,30 @@ void AutocompleteEditModel::AdjustTextForCopy(int sel_min,
   if (sel_min != 0)
     return;
 
-  // We can't use CurrentTextIsURL() or GetDataForURLExport() because right now
-  // the user is probably holding down control to cause the copy, which will
-  // screw up our calculation of the desired_tld.
-  if (!GetURLForText(*text, url))
-    return;  // Can't be parsed as a url, no need to adjust text.
-
   if (!user_input_in_progress() && is_all_selected) {
     // The user selected all the text and has not edited it. Use the url as the
     // text so that if the scheme was stripped it's added back, and the url
     // is unescaped (we escape parts of the url for display).
+    *url = PermanentURL();
     *text = UTF8ToUTF16(url->spec());
     *write_url = true;
     return;
   }
 
+  // We can't use CurrentTextIsURL() or GetDataForURLExport() because right now
+  // the user is probably holding down control to cause the copy, which will
+  // screw up our calculation of the desired_tld.
+  if (!GetURLForText(*text, url))

[Peter Kasting, 2011/08/30 21:30:52]

Inlining this function into here is fine with me.

+    return;  // Can't be parsed as a url, no need to adjust text.
+
   // Prefix the text with 'http://' if the text doesn't start with 'http://',
   // the text parses as a url with a scheme of http, the user selected the
   // entire host, and the user hasn't edited the host or manually removed the
   // scheme.
-  GURL perm_url;
-  if (GetURLForText(permanent_text_, &perm_url) &&
-      perm_url.SchemeIs(chrome::kHttpScheme) &&
-      url->SchemeIs(chrome::kHttpScheme) &&
-      perm_url.host() == url->host()) {
+  GURL perm_url(PermanentURL());
+  if (perm_url.SchemeIs(chrome::kHttpScheme) &&
+      url->SchemeIs(chrome::kHttpScheme) && perm_url.host() == url->host()) {
     *write_url = true;
-
     string16 http = ASCIIToUTF16(chrome::kHttpScheme) +
         ASCIIToUTF16(chrome::kStandardSchemeSeparator);
     if (text->compare(0, http.length(), http) != 0)
@@ -975,14 +973,11 @@ void AutocompleteEditModel::GetInfoForCurrentText(
 
 bool AutocompleteEditModel::GetURLForText(const string16& text,
                                           GURL* url) const {
-  GURL parsed_url;
-  const AutocompleteInput::Type type = AutocompleteInput::Parse(
-      UserTextFromDisplayText(text), string16(), NULL, NULL, &parsed_url);
-  if (type != AutocompleteInput::URL)
-    return false;
-
-  *url = parsed_url;
-  return true;
+  AutocompleteMatch match;
+  profile_->GetAutocompleteClassifier()->Classify(text, string16(),
+        KeywordIsSelected(), true, &match, NULL);
+  *url = match.destination_url;
+  return url->is_valid();

[Peter Kasting, 2011/08/30 21:30:52]

This should be:

  return match.transition == PageTransition::TYPED;

This will only be true when the url is valid, and it will reject cases where we
don't navigate by default.  The reason this is important is because otherwise,
if I'm currently on a Google search result page, and I type "foo" in the omnibox
and copy it, this function will return a destination URL that's a Google search
for "foo" and the caller will happily prepend "http://" because the hosts match.

 }
 
 void AutocompleteEditModel::RevertTemporaryText(bool revert_popup) {