search-workaround.patch

   1 Index: src/chrome/browser/search_engines/template_url.cc
   2 ===================================================================
   3 --- src/chrome/browser/search_engines/template_url.cc   (revision 46737)
   4 +++ src/chrome/browser/search_engines/template_url.cc   (working copy)
   5 @@ -313,27 +313,28 @@
   6         i != replacements_.rend(); ++i) {
   7      switch (i->type) {
   8        case ENCODING:
   9 -        url.insert(i->index, input_encoding);
  10 +        /* Temporary workaround according to http://crbug.com/41887 */
  11 +        url.replace(i->index, 0, input_encoding);
  12          break;
  13
  14        case GOOGLE_ACCEPTED_SUGGESTION:
  15          if (accepted_suggestion == NO_SUGGESTION_CHOSEN)
  16 -          url.insert(i->index, L"aq=f&");
  17 +          url.replace(i->index, 0, L"aq=f&");
  18          else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE)
  19 -          url.insert(i->index, StringPrintf(L"aq=%d&", accepted_suggestion));
  20 +          url.replace(i->index, 0, StringPrintf(L"aq=%d&", accepted_suggestion));
  21          break;
  22
  23        case GOOGLE_BASE_URL:
  24 -        url.insert(i->index, GoogleBaseURLValue());
  25 +        url.replace(i->index, 0, GoogleBaseURLValue());
  26          break;
  27
  28        case GOOGLE_BASE_SUGGEST_URL:
  29 -        url.insert(i->index, GoogleBaseSuggestURLValue());
  30 +        url.replace(i->index, 0, GoogleBaseSuggestURLValue());
  31          break;
  32
  33        case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
  34          if (accepted_suggestion >= 0)
  35 -          url.insert(i->index, L"oq=" +
  36 +          url.replace(i->index, 0, L"oq=" +
  37                       UTF16ToWideHack(encoded_original_query) + L"&");
  38          break;
  39
  40 @@ -347,7 +348,7 @@
  41          RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz_string);
  42          if (!rlz_string.empty()) {
  43            rlz_string = L"rlz=" + rlz_string + L"&";
  44 -          url.insert(i->index, rlz_string);
  45 +          url.replace(i->index, 0, rlz_string);
  46          }
  47  #endif
  48          break;
  49 @@ -358,18 +359,18 @@
  50          base::WideToCodepage(terms, WideToASCII(input_encoding).c_str(),
  51                               base::OnStringConversionError::SKIP,
  52                               &unescaped_terms);
  53 -        url.insert(i->index, std::wstring(unescaped_terms.begin(),
  54 +        url.replace(i->index, 0, std::wstring(unescaped_terms.begin(),
  55                                            unescaped_terms.end()));
  56          break;
  57        }
  58
  59        case LANGUAGE:
  60 -        url.insert(i->index,
  61 +        url.replace(i->index, 0,
  62                     ASCIIToWide(g_browser_process->GetApplicationLocale()));
  63          break;
  64
  65        case SEARCH_TERMS:
  66 -        url.insert(i->index, UTF16ToWideHack(encoded_terms));
  67 +        url.replace(i->index, 0, UTF16ToWideHack(encoded_terms));
  68          break;
  69
  70        default: