Commiting the changes from my previous cl that are specific to not including ...

chrome/common/temp_scaffolding_stubs.cc

 // Copyright (c) 2009 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 "temp_scaffolding_stubs.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/thread.h"
 #include "base/path_service.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/resource_bundle.h"
 #include "net/url_request/url_request_context.h"
+#include "webkit/glue/webcursor.h"
 
 // static
 size_t SessionRestore::num_tabs_to_load_ = 0;
 
 //--------------------------------------------------------------------------
 
 UserDataManager* UserDataManager::instance_ = NULL;
 
 UserDataManager* UserDataManager::Create() {
   DCHECK(!instance_);
@@ skipping 289 matching lines @@
 #if defined(OS_MACOSX)
 WebCursor::WebCursor() {
 }
 WebCursor::~WebCursor() {
 }
 bool WebCursor::Deserialize(const Pickle* pickle, void** iter) {
   NOTIMPLEMENTED();
   return false;
 }
 #endif