linux: drop temp_scaffolding_stubs

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2006-2008 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/search_engines/template_url.h"
 
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "net/base/escape.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/rlz/rlz.h"
+#endif
+
 // The TemplateURLRef has any number of terms that need to be replaced. Each of
 // the terms is enclosed in braces. If the character preceeding the final
 // brace is a ?, it indicates the term is optional and can be replaced with
 // an empty string.
 static const wchar_t kStartParameter = '{';
 static const wchar_t kEndParameter = '}';
 static const wchar_t kOptional = '?';
 
 // Known parameters found in the URL.
 static const wchar_t kSearchTermsParameter[] = L"searchTerms";
@@ skipping 264 matching lines @@
       case GOOGLE_BASE_SUGGEST_URL:
         url.insert(i->index, GoogleBaseSuggestURLValue());
         break;
 
       case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION:
         if (accepted_suggestion >= 0)
           url.insert(i->index, L"oq=" + encoded_original_query + L"&");
         break;
 
       case GOOGLE_RLZ: {
+#if defined(OS_WIN)

[Evan Stade, 2009/09/25 01:07:23]

move defines outside of case?

         std::wstring rlz_string;
         RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz_string);
         if (!rlz_string.empty()) {
           rlz_string = L"rlz=" + rlz_string + L"&";
           url.insert(i->index, rlz_string);
         }
         break;
+#endif

[Evan Stade, 2009/09/25 19:54:41]

still seems like this endif should come before the break;

       }
 
       case GOOGLE_UNESCAPED_SEARCH_TERMS: {
         std::string unescaped_terms;
         WideToCodepage(terms, WideToASCII(input_encoding).c_str(),
                        OnStringUtilConversionError::SKIP, &unescaped_terms);
         url.insert(i->index, std::wstring(unescaped_terms.begin(),
                                           unescaped_terms.end()));
         break;
       }
@@ skipping 250 matching lines @@
   }
   return GURL();
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_)
     keyword_.clear();
 }