2 files changed, 63 insertions, 5 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index e356d04..bb98432 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -4,6 +4,10 @@
 
 #include "temp_scaffolding_stubs.h"
 
+#include "build/build_config.h"
+
+#include <vector>
+
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/thread.h"
@@ -11,9 +15,9 @@
 #include "base/string_piece.h"
 #include "base/singleton.h"
 #include "base/task.h"
-#include "build/build_config.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"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/cache_manager_host.h"
@@ -52,6 +56,12 @@ AutocompleteProvider::~AutocompleteProvider() {
   NOTIMPLEMENTED();
 }
 
+std::wstring AutocompleteProvider::StringForURLDisplay(const GURL& url,
+                                                       bool check_accept_lang) {
+  NOTIMPLEMENTED();
+  return L"";
+}
+
 // static
 size_t AutocompleteResult::max_matches_;
 
@@ -67,6 +77,15 @@ std::string AutocompleteMatch::TypeToString(AutocompleteMatch::Type type) {
   return "";
 }
 
+void AutocompleteMatch::ClassifyLocationInString(
+    size_t match_location,
+    size_t match_length,
+    size_t overall_length,
+    int style,
+    ACMatchClassifications* classification) {
+  NOTIMPLEMENTED();
+}
+
 //--------------------------------------------------------------------------
 
 UserDataManager* UserDataManager::instance_ = NULL;
@@ -457,17 +476,42 @@ void HistoryURLProvider::ExecuteWithDB(history::HistoryBackend*,
 
 namespace bookmark_utils {
 
-bool MoreRecentlyAdded(BookmarkNode* n1, BookmarkNode* n2) {
+bool DoesBookmarkContainText(BookmarkNode* node, const std::wstring& text) {
   NOTIMPLEMENTED();
   return false;
 }
 
+void GetMostRecentlyAddedEntries(BookmarkModel* model,
+                                 size_t count,
+                                 std::vector<BookmarkNode*>* nodes) {
+  NOTIMPLEMENTED();
+}
+
 std::vector<BookmarkNode*> GetMostRecentlyModifiedGroups(BookmarkModel* model,
                                                          size_t max_count) {
   NOTIMPLEMENTED();
   return std::vector<BookmarkNode*>();
 }
 
+void GetBookmarksContainingText(BookmarkModel* model,
+                                const std::wstring& text,
+                                size_t max_count,
+                                std::vector<BookmarkNode*>* nodes) {
+  NOTIMPLEMENTED();
+}
+
+void GetBookmarksMatchingText(BookmarkModel* model,
+                              const std::wstring& text,
+                              size_t max_count,
+                              std::vector<TitleMatch>* matches) {
+  NOTIMPLEMENTED();
+}
+
+bool MoreRecentlyAdded(BookmarkNode* n1, BookmarkNode* n2) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
 }
 
 ScopableCPRequest::~ScopableCPRequest() {
@@ -513,3 +557,20 @@ void CPHandleCommand(int command, CPCommandInterface* data,
                      CPBrowsingContext context) {
   NOTIMPLEMENTED();
 }
+
+bool CanImportURL(const GURL& url) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool DOMUIContentsCanHandleURL(GURL* url,
+                               TabContentsType* result_type) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool NewTabUIHandleURL(GURL* url,
+                       TabContentsType* result_type) {
+  NOTIMPLEMENTED();
+  return false;
+}
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index d76a1f2..394e81d 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -19,8 +19,6 @@
 #include "base/ref_counted.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/cancelable_request.h"
@@ -53,7 +51,6 @@
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
-class BookmarkService;
 class CommandLine;
 class ConstrainedWindow;
 class CPCommandInterface;