linux: drop temp_scaffolding_stubs

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 2084780481de67ce912d92189931ac9f2a297372..9acf9af0f3a8030475e69f0ded65e6936280de60 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -9,11 +9,14 @@
 #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
@@ -298,6 +301,7 @@ std::wstring TemplateURLRef::ReplaceSearchTerms(
         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()) {
@@ -305,6 +309,7 @@ std::wstring TemplateURLRef::ReplaceSearchTerms(
           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: {