Make autocomplete.cc and dependencies compile on Posix.

Review URL: http://codereview.chromium.org/28061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10277 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 74 insertions, 74 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index a735947..bbd4509 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "chrome/browser/autocomplete/autocomplete.h"
 
 #include <algorithm>
@@ -12,8 +14,6 @@
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gfx/text_elider.h"
@@ -26,6 +26,15 @@
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
+#include "net/url_request/url_request.h"
+
+// TODO(port): Port this file.
+#if defined(OS_WIN)
+#include "chrome/browser/external_protocol_handler.h"
+#include "chrome/browser/history_tab_ui.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
 
 using base::TimeDelta;
 
@@ -176,7 +185,8 @@ AutocompleteInput::Type AutocompleteInput::Parse(const std::wstring& text,
     // more likely a search (for the answer to a math problem) than a URL.
     url_parse::Component components[4];
     const bool found_ipv4 =
-        url_canon::FindIPv4Components(text.c_str(), parts->host, components);
+        url_canon::FindIPv4Components(WideToUTF8(text).c_str(),
+                                      parts->host, components);
     DCHECK(found_ipv4);
     for (size_t i = 0; i < arraysize(components); ++i) {
       if (!components[i].is_nonempty())
@@ -418,9 +428,15 @@ void AutocompleteProvider::SetProfile(Profile* profile) {
 std::wstring AutocompleteProvider::StringForURLDisplay(
     const GURL& url,
     bool check_accept_lang) {
+#if !defined(OS_MACOSX)
   return gfx::ElideUrl(url, ChromeFont(), 0, check_accept_lang && profile_ ?
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) :
       std::wstring());
+#else
+  // TODO(port): need gfx::ElideUrl and ChromeFont
+  NOTIMPLEMENTED();
+  return std::wstring();
+#endif
 }
 
 void AutocompleteProvider::UpdateStarredStateOfMatches() {
diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index ea02ff2..ff7cd3d 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.h
@@ -37,7 +37,7 @@ class HistoryContentsProvider : public AutocompleteProvider {
 
   // The maximum match count we'll report. If the db_match_count is greater
   // than this, it will be clamped to this result.
-  static const int kMaxMatchCount = 50;
+  static const size_t kMaxMatchCount = 50;
 
  private:
   void QueryComplete(HistoryService::Handle handle,
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 309aa31..539eac78 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <algorithm>
@@ -225,8 +227,8 @@ void HistoryURLProvider::SuggestExactInput(const AutocompleteInput& input,
   // suggestion, since it can't be navigated to.  We also need this so other
   // history suggestions don't duplicate the same effective URL as this.
   // TODO(brettw) make autocomplete use GURL!
-  GURL canonicalized_url(URLFixerUpper::FixupURL(input.text(),
-                                                 input.desired_tld()));
+  GURL canonicalized_url(URLFixerUpper::FixupURL(WideToUTF8(input.text()),
+      WideToUTF8(input.desired_tld())));
   if (!canonicalized_url.is_valid() ||
       (canonicalized_url.IsStandard() &&
        !canonicalized_url.SchemeIsFile() && canonicalized_url.host().empty()))
@@ -288,8 +290,9 @@ bool HistoryURLProvider::FixupExactSuggestion(history::URLDatabase* db,
     // This code should match what SuggestExactInput() would do with no
     // desired_tld().
     // TODO(brettw) make autocomplete use GURL!
-    GURL destination_url(URLFixerUpper::FixupURL(params->input.text(),
-                                                 std::wstring()));
+    GURL destination_url(
+        URLFixerUpper::FixupURL(WideToUTF8(params->input.text()),
+        std::string()));
     if (!db->GetRowForURL(destination_url, &info))
       return false;
   } else {
@@ -333,7 +336,8 @@ bool HistoryURLProvider::PromoteMatchForInlineAutocomplete(
 // static
 std::wstring HistoryURLProvider::FixupUserInput(const std::wstring& input) {
   // Fixup and canonicalize user input.
-  const GURL canonical_gurl(URLFixerUpper::FixupURL(input, std::wstring()));
+  const GURL canonical_gurl(URLFixerUpper::FixupURL(WideToUTF8(input),
+      std::string()));
   std::wstring output(UTF8ToWide(canonical_gurl.possibly_invalid_spec()));
   if (output.empty())
     return input;  // This probably won't happen, but there are no guarantees.
@@ -342,7 +346,7 @@ std::wstring HistoryURLProvider::FixupUserInput(const std::wstring& input) {
   // upper only prepends the "http" scheme, that's all we need to check for.
   url_parse::Component scheme;
   if (canonical_gurl.SchemeIs("http") &&
-      !url_util::FindAndCompareScheme(input, "http", &scheme))
+      !url_util::FindAndCompareScheme(WideToUTF8(input), "http", &scheme))
     TrimHttpPrefix(&output);
 
   // Make the number of trailing slashes on the output exactly match the input.
@@ -377,7 +381,7 @@ std::wstring HistoryURLProvider::FixupUserInput(const std::wstring& input) {
 // static
 size_t HistoryURLProvider::TrimHttpPrefix(std::wstring* url) {
   url_parse::Component scheme;
-  if (!url_util::FindAndCompareScheme(*url, "http", &scheme))
+  if (!url_util::FindAndCompareScheme(WideToUTF8(*url), "http", &scheme))
     return 0;  // Not "http".
 
   // Erase scheme plus up to two slashes.
@@ -589,8 +593,8 @@ void HistoryURLProvider::RunAutocompletePasses(const AutocompleteInput& input,
 
   // Create a match for exactly what the user typed.  This will always be one
   // of the top two results we return.
-  const bool trim_http = !url_util::FindAndCompareScheme(input.text(),
-                                                         "http", NULL);
+  const bool trim_http = !url_util::FindAndCompareScheme(
+      WideToUTF8(input.text()), "http", NULL);
   SuggestExactInput(input, trim_http);
 
   // We'll need the history service to run both passes, so try to obtain it.
@@ -798,8 +802,13 @@ AutocompleteMatch HistoryURLProvider::HistoryMatchToACMatch(
       CalculateRelevance(params->input.type(), match_type, match_number),
       !!info.visit_count(), AutocompleteMatch::HISTORY_URL);
   match.destination_url = info.url();
+#if !defined(OS_MACOSX)
   match.fill_into_edit = gfx::ElideUrl(info.url(), ChromeFont(), 0,
       match_type == WHAT_YOU_TYPED ? std::wstring() : params->languages);
+#else
+  // TODO(port): ChromeFont() and gfx::ElideUrl not implemented on mac.
+  NOTIMPLEMENTED();
+#endif
   if (!params->input.prevent_inline_autocomplete()) {
     match.inline_autocomplete_offset =
         history_match.input_location + params->input.text().length();
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 8e39bd0..8c9a8e3 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "chrome/browser/autocomplete/search_provider.h"
 
 #include "base/message_loop.h"
@@ -325,7 +327,8 @@ bool SearchProvider::ParseSuggestResults(Value* root_val) {
           site_val->GetAsString(&site_name)) {
         // We can't blindly trust the URL coming from the server to be valid.
         GURL result_url =
-            GURL(URLFixerUpper::FixupURL(suggestion_str, std::wstring()));
+            GURL(URLFixerUpper::FixupURL(WideToUTF8(suggestion_str),
+                                         std::string()));
         if (result_url.is_valid()) {
           navigation_results_.push_back(NavigationResult(result_url,
                                                          site_name));
@@ -577,7 +580,8 @@ AutocompleteMatch SearchProvider::NavigationToMatch(
   match.contents = StringForURLDisplay(navigation.url, true);
   // TODO(kochi): Consider moving HistoryURLProvider::TrimHttpPrefix() to some
   // public utility function.
-  if (!url_util::FindAndCompareScheme(input_.text(), "http", NULL))
+  if (!url_util::FindAndCompareScheme(WideToUTF8(input_.text()),
+                                      "http", NULL))
     TrimHttpPrefix(&match.contents);
   AutocompleteMatch::ClassifyMatchInString(input_.text(), match.contents,
                                            ACMatchClassification::URL,
@@ -604,7 +608,7 @@ AutocompleteMatch SearchProvider::NavigationToMatch(
 // static
 size_t SearchProvider::TrimHttpPrefix(std::wstring* url) {
   url_parse::Component scheme;
-  if (!url_util::FindAndCompareScheme(*url, "http", &scheme))
+  if (!url_util::FindAndCompareScheme(WideToUTF8(*url), "http", &scheme))
     return 0;  // Not "http".
 
   // Erase scheme plus up to two slashes.
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 61a3d3a..d5d1063 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -663,13 +663,10 @@ if not env.Bit('windows'):
   # TODO: Port these.
   input_files.Remove(
       'app_modal_dialog_queue.cc',
-      'autocomplete/autocomplete.cc',
       'autocomplete/autocomplete_accessibility.cc',
       'autocomplete/autocomplete_edit.cc',
       'autocomplete/autocomplete_popup.cc',
       'autocomplete/edit_drop_target.cc',
-      'autocomplete/history_url_provider.cc',
-      'autocomplete/search_provider.cc',
       'automation/automation_provider.cc',
       'automation/automation_provider_list.cc',
       'automation/ui_controls.cc',
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index a8bc0e4..866289a 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -81,6 +81,7 @@
 		0ED14155E711F5BD0E6069ED /* user_data_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 622534301BD3F4A908D426D0 /* user_data_manager.cc */; };
 		0EE123B79B750A2FCEFB4569 /* history_backend_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F00E9D48F7009A6919 /* history_backend_unittest.cc */; };
 		0FF05474D5345CABC5C85B5F /* save_package_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9DC0E9D48CE009A6919 /* save_package_unittest.cc */; };
+		12E687ED55D418FEE894F824 /* history_url_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = D3C3DAA911D390A33D06B0B0 /* history_url_provider.cc */; };
 		1647A33CB5B4B14087BFF5C8 /* dns_global.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA680E9D4981009A6919 /* dns_global.cc */; };
 		1C284EB767D0E3D302AC675C /* tab_restore_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = B020A11D500D7519E54F2957 /* tab_restore_service.cc */; };
 		1FFE452BCABBD0158B029D4D /* plugin_process_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8DD0E9D4839009A6919 /* plugin_process_host.cc */; };
@@ -389,6 +390,8 @@
 		CA8133120F423C710096C1DC /* url_database_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA150E9D48F7009A6919 /* url_database_unittest.cc */; };
 		CA81331D0F423DB40096C1DC /* pref_member_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBE70E9D4C9F009A6919 /* pref_member_unittest.cc */; };
 		CABE9938BF2DF78D9862DC8B /* template_url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16EDB0F21455600861FAC /* template_url_fetcher.cc */; };
+		CC5A49EE23E4F332B06C99C8 /* search_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0114EE7E1097BDFBF94057E6 /* search_provider.cc */; };
+		CE32446438BB391ACC07C3B7 /* autocomplete.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4F3E216FC08B4749FC8C2ED5 /* autocomplete.cc */; };
 		D87A8ECE6652FC99AF1ADA6F /* ssl_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16ECC0F21451600861FAC /* ssl_manager.cc */; };
 		DDB41CECE38B852000F30D9F /* browsing_data_remover.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF84E0E9D4839009A6919 /* browsing_data_remover.cc */; };
 		E40CC5E30F2E348900708647 /* history_contents_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = E40CC5E10F2E348900708647 /* history_contents_provider.cc */; };
@@ -1858,6 +1861,7 @@
 /* Begin PBXFileReference section */
 		0082A7510F16987A000AA0EF /* user_script_master.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_script_master.cc; sourceTree = "<group>"; };
 		0082A7520F16987A000AA0EF /* user_script_master.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user_script_master.h; sourceTree = "<group>"; };
+		0114EE7E1097BDFBF94057E6 /* search_provider.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = search_provider.cc; path = browser/autocomplete/search_provider.cc; sourceTree = SOURCE_ROOT; };
 		05C9D404FC8116984CCCEDED /* base_session_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base_session_service.cc; path = sessions/base_session_service.cc; sourceTree = "<group>"; };
 		0B7CC9C105E90E0665852528 /* url_fetcher_protect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher_protect.cc; sourceTree = "<group>"; };
 		1F43A7C85092C58AAF011F78 /* greasemonkey_api_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = greasemonkey_api_unittest.cc; path = extensions/greasemonkey_api_unittest.cc; sourceTree = "<group>"; };
@@ -2429,6 +2433,7 @@
 		4D7FA6210F13CA04004F1B19 /* ui_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ui_tests; sourceTree = BUILT_PRODUCTS_DIR; };
 		4DCE9E2C0EF0B8C000682526 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		4DDC64500EAE392400FB5EBE /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = third_party/zlib/zlib.xcodeproj; sourceTree = "<group>"; };
+		4F3E216FC08B4749FC8C2ED5 /* autocomplete.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = autocomplete.cc; path = browser/autocomplete/autocomplete.cc; sourceTree = SOURCE_ROOT; };
 		4F9429998AC2703984BAB828 /* resolve_proxy_msg_helper.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resolve_proxy_msg_helper.cc; sourceTree = "<group>"; };
 		534E66C30F311BEC0006B2B2 /* temp_scaffolding_stubs.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = temp_scaffolding_stubs.cc; sourceTree = "<group>"; };
 		56E1D7DF17D327BFCB0B895D /* test_web_contents.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_web_contents.cc; path = tab_contents/test_web_contents.cc; sourceTree = "<group>"; };
@@ -2632,6 +2637,7 @@
 		C18F2A0A6FB6BEF75406511D /* chrome_paths_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chrome_paths_mac.cc; sourceTree = "<group>"; };
 		C3F9577C67188A5A4E3A6E41 /* session_restore.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_restore.cc; path = sessions/session_restore.cc; sourceTree = "<group>"; };
 		C8D26D9EC81E03E91E270463 /* session_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = session_service.cc; path = sessions/session_service.cc; sourceTree = "<group>"; };
+		D3C3DAA911D390A33D06B0B0 /* history_url_provider.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = history_url_provider.cc; path = browser/autocomplete/history_url_provider.cc; sourceTree = SOURCE_ROOT; };
 		D74DA6A9031CAE292790BD5E /* file_descriptor_set_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_descriptor_set_unittest.cc; sourceTree = "<group>"; };
 		D941DBEFD8B8B537DE8A4DAE /* bookmark_storage.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bookmark_storage.cc; path = bookmarks/bookmark_storage.cc; sourceTree = "<group>"; };
 		E40CC5E10F2E348900708647 /* history_contents_provider.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = history_contents_provider.cc; path = autocomplete/history_contents_provider.cc; sourceTree = "<group>"; };
@@ -3167,6 +3173,9 @@
 				4D7BFDD00E9D527E009A6919 /* Frameworks */,
 				4D7BFB090E9D4BA1009A6919 /* Projects */,
 				4D7BF3070E9D477E009A6919 /* Products */,
+				D3C3DAA911D390A33D06B0B0 /* history_url_provider.cc */,
+				4F3E216FC08B4749FC8C2ED5 /* autocomplete.cc */,
+				0114EE7E1097BDFBF94057E6 /* search_provider.cc */,
 			);
 			sourceTree = "<group>";
 		};
@@ -5434,6 +5443,7 @@
 				4D7BFA1E0E9D48FD009A6919 /* archived_database.cc in Sources */,
 				E45075DC0F150A53003BE099 /* async_resource_handler.cc in Sources */,
 				ABFA33770F424E47008FCF5D /* audio_renderer_host.cc in Sources */,
+				CE32446438BB391ACC07C3B7 /* autocomplete.cc in Sources */,
 				6D62D71064BA3204EF0A964A /* autofill_manager.cc in Sources */,
 				E43A770B0F1660EA00ABD5D1 /* automation_resource_tracker.cc in Sources */,
 				E434BFD90F3A074300B665C7 /* backing_store.cc in Sources */,
@@ -5517,6 +5527,7 @@
 				65930533A98EF22451EEA01D /* history_publisher_none.cc in Sources */,
 				4D7BFA1F0E9D4901009A6919 /* history_types.cc in Sources */,
 				E477FF4F0F5338600044ABEB /* history_ui.cc in Sources */,
+				12E687ED55D418FEE894F824 /* history_url_provider.cc in Sources */,
 				4D7BFA240E9D4905009A6919 /* in_memory_database.cc in Sources */,
 				4D7BFA260E9D4908009A6919 /* in_memory_history_backend.cc in Sources */,
 				96DF109FEE9B09B11690F1FA /* infobar_delegate.cc in Sources */,
@@ -5570,6 +5581,7 @@
 				36F859CE61900AFD2AB67A91 /* save_item.cc in Sources */,
 				F958714A0B14B028646CF087 /* save_package.cc in Sources */,
 				E4F324650EE5D082002533CE /* sdch_dictionary_fetcher.cc in Sources */,
+				CC5A49EE23E4F332B06C99C8 /* search_provider.cc in Sources */,
 				9084D27A4F8690E6FD31083B /* session_backend.cc in Sources */,
 				E45075F40F150C01003BE099 /* session_command.cc in Sources */,
 				E45075F70F150C0C003BE099 /* session_id.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index b56a773..39cafaa 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -15,7 +15,6 @@
 #include "base/string_piece.h"
 #include "base/singleton.h"
 #include "base/task.h"
-#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
@@ -49,54 +48,6 @@
 
 //--------------------------------------------------------------------------
 
-// static
-size_t AutocompleteProvider::max_matches_;
-
-AutocompleteProvider::~AutocompleteProvider() {
-  // Though nothing needs this function yet, we want to get the C++ metadata
-  // for this class grounded in this file.
-  NOTIMPLEMENTED();
-}
-
-std::wstring AutocompleteProvider::StringForURLDisplay(const GURL& url,
-                                                       bool check_accept_lang) {
-  NOTIMPLEMENTED();
-  return L"";
-}
-
-// static
-size_t AutocompleteResult::max_matches_;
-
-AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
-                                     int relevance,
-                                     bool deletable,
-                                     Type type) {
-  NOTIMPLEMENTED();
-}
-
-//static
-std::string AutocompleteInput::TypeToString(AutocompleteInput::Type type) {
-  NOTIMPLEMENTED();
-  return "";
-}
-
-//static
-std::string AutocompleteMatch::TypeToString(AutocompleteMatch::Type type) {
-  NOTIMPLEMENTED();
-  return "";
-}
-
-void AutocompleteMatch::ClassifyLocationInString(
-    size_t match_location,
-    size_t match_length,
-    size_t overall_length,
-    int style,
-    ACMatchClassifications* classification) {
-  NOTIMPLEMENTED();
-}
-
-//--------------------------------------------------------------------------
-
 bool ShellIntegration::SetAsDefaultBrowser() {
   NOTIMPLEMENTED();
   return true;
@@ -403,12 +354,6 @@ void DebuggerShell::ProcessCommand(const std::wstring& data) {
 }
 #endif  // !CHROME_DEBUGGER_DISABLED
 
-void HistoryURLProvider::ExecuteWithDB(history::HistoryBackend*,
-                                       history::URLDatabase*,
-                                       HistoryURLProviderParams*) {
-  NOTIMPLEMENTED();
-}
-
 namespace bookmark_utils {
 
 bool DoesBookmarkContainText(BookmarkNode* node, const std::wstring& text) {
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 05fdf0e..5179ffa 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -628,6 +628,15 @@ LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
 
 class ExternalProtocolHandler {
  public:
+  enum BlockState {
+    DONT_BLOCK,
+    BLOCK,
+    UNKNOWN,
+  };
+  static BlockState GetBlockState(const std::wstring& scheme) {
+    NOTIMPLEMENTED();
+    return UNKNOWN;
+  }
   static void LaunchUrl(const GURL& url, int render_process_host_id,
                         int tab_contents_id) {
     NOTIMPLEMENTED();
@@ -663,4 +672,12 @@ class FontsLanguagesWindowView {
   void SelectLanguagesTab() { NOTIMPLEMENTED(); }
 };
 
+class HistoryTabUI {
+ public:
+  static const GURL GetHistoryURLWithSearchText(const std::wstring& text) {
+    NOTIMPLEMENTED();
+    return GURL();
+  }
+};
+
 #endif  // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_