Porting in chrome/ (add 6 files to Linux SCons build)

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

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

7 files changed, 12 insertions, 15 deletions

diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h
index 54672fb..66c327a 100644
--- a/chrome/browser/automation/automation_resource_tracker.h
+++ b/chrome/browser/automation/automation_resource_tracker.h
@@ -28,7 +28,7 @@ struct AutomationResourceTraits<T*> {
 class AutomationResourceTrackerImpl {
 public:
   AutomationResourceTrackerImpl(IPC::Message::Sender* sender)
-    :sender_(sender), cleared_mappings_(false) {}
+    : cleared_mappings_(false), sender_(sender) {}
 
   virtual ~AutomationResourceTrackerImpl() {}
 
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 04e55a4..3cebdb8 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -43,6 +43,7 @@ if not env.Bit('mac'):
   # TODO: Port to Mac.
   input_files.extend([
       'autocomplete/keyword_provider.cc',
+      'automation/automation_resource_tracker.cc',
       'automation/url_request_failed_dns_job.cc',
       'automation/url_request_mock_http_job.cc',
       'automation/url_request_mock_net_error_job.cc',
@@ -52,8 +53,10 @@ if not env.Bit('mac'):
       'browser_process.cc',
       'browser_trial.cc',
       'cancelable_request.cc',
+      'chrome_plugin_browsing_context.cc',
       'chrome_thread.cc',
       'cross_site_request_manager.cc',
+      'dom_ui/chrome_url_data_manager.cc',
       'download/save_file.cc',
       'extensions/extension.cc',
       'extensions/extensions_service.cc',
@@ -87,6 +90,7 @@ if not env.Bit('mac'):
       'meta_table_helper.cc',
       'metrics_log.cc',
       'metrics_response.cc',
+      'net/chrome_url_request_context.cc',
       'net/dns_host_info.cc',
       'net/referrer.cc',
       'net/sdch_dictionary_fetcher.cc',
@@ -95,8 +99,10 @@ if not env.Bit('mac'):
       'printing/page_range.cc',
       'printing/page_setup.cc',
       'printing/units.cc',
+      'provisional_load_details.cc',
       'renderer_host/async_resource_handler.cc',
       'renderer_host/buffered_resource_handler.cc',
+      'renderer_host/download_resource_handler.cc',
       'renderer_host/download_throttling_resource_handler.cc',
       'renderer_host/safe_browsing_resource_handler.cc',
       'renderer_host/save_file_resource_handler.cc',
@@ -141,7 +147,6 @@ if env.Bit('windows'):
       'autocomplete/search_provider.cc',
       'automation/automation_provider.cc',
       'automation/automation_provider_list.cc',
-      'automation/automation_resource_tracker.cc',
       'automation/ui_controls.cc',
       'back_forward_menu_model.cc',
       'base_history_model.cc',
@@ -169,11 +174,9 @@ if env.Bit('windows'):
       'cache_manager_host.cc',
       'cert_store.cc',
       'character_encoding.cc',
-      'chrome_plugin_browsing_context.cc',
       'chrome_plugin_host.cc',
       'controller.cc',
       'dock_info.cc',
-      'dom_ui/chrome_url_data_manager.cc',
       'dom_ui/dom_ui_contents.cc',
       'dom_ui/dom_ui_host.cc',
       'dom_ui/dom_ui.cc',
@@ -226,7 +229,6 @@ if env.Bit('windows'):
       'native_ui_contents.cc',
       'navigation_controller.cc',
       'navigation_entry.cc',
-      'net/chrome_url_request_context.cc',
       'net/dns_global.cc',
       'net/dns_master.cc',
       'net/dns_slave.cc',
@@ -249,7 +251,6 @@ if env.Bit('windows'):
       'printing/win_printing_context.cc',
       'profile.cc',
       'profile_manager.cc',
-      'provisional_load_details.cc',
       'render_process_host.cc',
       'render_view_context_menu.cc',
       'render_view_context_menu_controller.cc',
@@ -258,7 +259,6 @@ if env.Bit('windows'):
       'render_widget_helper.cc',
       'render_widget_host.cc',
       'renderer_host/cross_site_resource_handler.cc',
-      'renderer_host/download_resource_handler.cc',
       'renderer_host/resource_dispatcher_host.cc',
       'repost_form_warning_dialog.cc',
       'resource_message_filter.cc',
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 940ed68..a180280 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -30,9 +30,6 @@ static const char kChromeURLScheme[] = "chrome";
 // The single global instance of ChromeURLDataManager.
 ChromeURLDataManager chrome_url_data_manager;
 
-// The ProtocolFactory for creating URLRequestChromeJobs.
-static URLRequest::ProtocolFactory Factory;
-
 // URLRequestChromeJob is a URLRequestJob that manages running chrome-internal
 // resource requests asynchronously.
 // It hands off URL requests to ChromeURLDataManager, which asynchronously
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/dom_ui/chrome_url_data_manager.h
index 102ab99..224b602 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.h
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.h
@@ -14,6 +14,7 @@
 class GURL;
 class MessageLoop;
 class URLRequest;
+class URLRequestChromeJob;
 class URLRequestJob;
 
 // To serve dynamic data off of chrome: URLs, implement the
diff --git a/chrome/browser/provisional_load_details.cc b/chrome/browser/provisional_load_details.cc
index ffc85a0..fcd1558 100644
--- a/chrome/browser/provisional_load_details.cc
+++ b/chrome/browser/provisional_load_details.cc
@@ -12,10 +12,10 @@ ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame,
                                                const GURL& url,
                                                const std::string& security_info,
                                                bool is_content_filtered)
-      : is_main_frame_(is_main_frame),
-        is_in_page_navigation_(is_in_page_navigation),
+      : error_code_(net::OK),
         url_(url),
-        error_code_(net::OK),
+        is_main_frame_(is_main_frame),
+        is_in_page_navigation_(is_in_page_navigation),
         is_content_filtered_(is_content_filtered) {
   SSLManager::DeserializeSecurityInfo(security_info,
                                       &ssl_cert_id_,
diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h
index 52f6c94..b666df6 100644
--- a/chrome/browser/renderer_host/download_resource_handler.h
+++ b/chrome/browser/renderer_host/download_resource_handler.h
@@ -66,7 +66,7 @@ class DownloadResourceHandler : public ResourceHandler {
   base::OneShotTimer<DownloadResourceHandler> pause_timer_;
 
   static const int kReadBufSize = 32768;  // bytes
-  static const int kLoadsToWrite = 100;  // number of data buffers queued
+  static const size_t kLoadsToWrite = 100;  // number of data buffers queued
   static const int kThrottleTimeMs = 200;  // milliseconds
 
   DISALLOW_COPY_AND_ASSIGN(DownloadResourceHandler);
diff --git a/chrome/browser/ssl_manager.h b/chrome/browser/ssl_manager.h
index 2f08a93..9434a4b 100644
--- a/chrome/browser/ssl_manager.h
+++ b/chrome/browser/ssl_manager.h
@@ -17,7 +17,6 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/views/link.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"