search-workaround.patch

   1 --- chromium-browser-10.0.647.0~svn20110123r72286/src/chrome/browser/search_engines/template_url.cc.orig        2011-01-22 04:01:50.000000000 +0100
   2 +++ chromium-browser-10.0.647.0~svn20110123r72286/src/chrome/browser/search_engines/template_url.cc     2011-01-23 13:22:52.878238576 +0100
   3 @@ -341,27 +341,28 @@
   4         i != replacements_.rend(); ++i) {
   5      switch (i->type) {
   6        case ENCODING:
   7 -        url.insert(i->index, input_encoding);
   8 +        /* Temporary workaround according to http://crbug.com/41887 */
   9 +        url.replace(i->index, 0, input_encoding);
  10          break;
  11
  12        case GOOGLE_ACCEPTED_SUGGESTION:
  13          if (accepted_suggestion == NO_SUGGESTION_CHOSEN)
  14 -          url.insert(i->index, "aq=f&");
  15 +          url.replace(i->index, 0, "aq=f&");
  16          else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE)
  17 -          url.insert(i->index, StringPrintf("aq=%d&", accepted_suggestion));
  18 +          url.replace(i->index, 0, StringPrintf("aq=%d&", accepted_suggestion));
  19          break;
  20
  21        case GOOGLE_BASE_URL:
  22 -        url.insert(i->index, search_terms_data.GoogleBaseURLValue());
  23 +        url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue());
  24          break;
  25
  26        case GOOGLE_BASE_SUGGEST_URL:
  27 -        url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue());
  28 +        url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue());
  29          break;
  30
  31        case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
  32          if (accepted_suggestion >= 0)
  33 -          url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
  34 +          url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) +
  35                                 "&");
  36          break;
  37
  38 @@ -385,17 +386,17 @@
  39          base::UTF16ToCodepage(terms, input_encoding.c_str(),
  40                                base::OnStringConversionError::SKIP,
  41                                &unescaped_terms);
  42 -        url.insert(i->index, std::string(unescaped_terms.begin(),
  43 +        url.replace(i->index, 0, std::string(unescaped_terms.begin(),
  44                                           unescaped_terms.end()));
  45          break;
  46        }
  47
  48        case LANGUAGE:
  49 -        url.insert(i->index, search_terms_data.GetApplicationLocale());
  50 +        url.replace(i->index, 0, search_terms_data.GetApplicationLocale());
  51          break;
  52
  53        case SEARCH_TERMS:
  54 -        url.insert(i->index, UTF16ToUTF8(encoded_terms));
  55 +        url.replace(i->index, 0, UTF16ToUTF8(encoded_terms));
  56          break;
  57
  58        default: