Remove the temporary scaffolding stubs.

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2010 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/browser_process_impl.h"
 
 #include "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugin_service.h"
+#include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/appcache/chrome_appcache_service.h"
 #include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "ipc/ipc_logging.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
 #endif
 
-#if defined(OS_LINUX)
-// TODO(port): get rid of this.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#else
-#include "chrome/browser/printing/print_job_manager.h"
-#endif
-
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #endif
 
 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
     : created_resource_dispatcher_host_(false),
       created_metrics_service_(false),
       created_io_thread_(false),
       created_file_thread_(false),
@@ skipping 416 matching lines @@
   DCHECK(file_thread_->message_loop() == MessageLoop::current());
   bool result = false;
 
   FilePath inspector_dir;
   if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
     result = file_util::PathExists(inspector_dir);
   }
 
   have_inspector_files_ = result;
 }