search-workaround.patch

   1 --- chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc.orig        2011-05-12 04:00:22.000000000 +0200
   2 +++ chromium-browser-13.0.763.0~svn20110512r85088/src/chrome/browser/search_engines/template_url.cc     2011-05-12 18:20:21.260874114 +0200
   3 @@ -347,28 +347,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,
  18 -                     base::StringPrintf("aq=%d&", accepted_suggestion));
  19 +          url.replace(i->index, 0, base::StringPrintf("aq=%d&", accepted_suggestion));
  20          break;
  21
  22        case GOOGLE_BASE_URL:
  23 -        url.insert(i->index, search_terms_data.GoogleBaseURLValue());
  24 +        url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue());
  25          break;
  26
  27        case GOOGLE_BASE_SUGGEST_URL:
  28 -        url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue());
  29 +        url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue());
  30          break;
  31
  32        case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
  33          if (accepted_suggestion >= 0)
  34 -          url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
  35 +          url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) +
  36                                 "&");
  37          break;
  38
  39 @@ -392,17 +392,17 @@
  40          base::UTF16ToCodepage(terms, input_encoding.c_str(),
  41                                base::OnStringConversionError::SKIP,
  42                                &unescaped_terms);
  43 -        url.insert(i->index, std::string(unescaped_terms.begin(),
  44 +        url.replace(i->index, 0, std::string(unescaped_terms.begin(),
  45                                           unescaped_terms.end()));
  46          break;
  47        }
  48
  49        case LANGUAGE:
  50 -        url.insert(i->index, search_terms_data.GetApplicationLocale());
  51 +        url.replace(i->index, 0, search_terms_data.GetApplicationLocale());
  52          break;
  53
  54        case SEARCH_TERMS:
  55 -        url.insert(i->index, UTF16ToUTF8(encoded_terms));
  56 +        url.replace(i->index, 0, UTF16ToUTF8(encoded_terms));
  57          break;
  58
  59        default: