12 files changed, 97 insertions, 45 deletions
diff --git a/chrome/browser/geolocation/network_location_provider.cc b/chrome/browser/geolocation/network_location_provider.cc
index 6c985e1..37c3a38 100644
--- a/chrome/browser/geolocation/network_location_provider.cc
+++ b/chrome/browser/geolocation/network_location_provider.cc
@@ -17,6 +17,10 @@ const int kDataCompleteWaitPeriod = 1000 * 2;  // 2 seconds
 // static
 const size_t NetworkLocationProvider::PositionCache::kMaximumSize = 10;
 
+NetworkLocationProvider::PositionCache::PositionCache() {}
+
+NetworkLocationProvider::PositionCache::~PositionCache() {}
+
 bool NetworkLocationProvider::PositionCache::CachePosition(
     const GatewayData& gateway_data,
     const WifiData& wifi_data,
diff --git a/chrome/browser/geolocation/network_location_provider.h b/chrome/browser/geolocation/network_location_provider.h
index 47267f2..1e2485b 100644
--- a/chrome/browser/geolocation/network_location_provider.h
+++ b/chrome/browser/geolocation/network_location_provider.h
@@ -35,6 +35,9 @@ class NetworkLocationProvider
     // device data.
     static const size_t kMaximumSize;
 
+    PositionCache();
+    ~PositionCache();
+
     // Caches the current position response for the current set of cell ID and
     // WiFi data. In the case of the cache exceeding kMaximumSize this will
     // evict old entries in FIFO orderer of being added.
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 857618a..063f860 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -125,6 +125,7 @@
         'renderer/indexed_db_dispatcher.h',
         'renderer/localized_error.cc',
         'renderer/localized_error.h',
+        'renderer/navigation_state.cc',
         'renderer/navigation_state.h',
         'renderer/notification_provider.cc',
         'renderer/notification_provider.h',
diff --git a/chrome/renderer/dom_ui_bindings.cc b/chrome/renderer/dom_ui_bindings.cc
index d5fb7c5..5ca2e57 100644
--- a/chrome/renderer/dom_ui_bindings.cc
+++ b/chrome/renderer/dom_ui_bindings.cc
@@ -12,6 +12,11 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 
+DOMBoundBrowserObject::DOMBoundBrowserObject()
+    : sender_(NULL),
+      routing_id_(0) {
+}
+
 DOMBoundBrowserObject::~DOMBoundBrowserObject() {
   STLDeleteContainerPointers(properties_.begin(), properties_.end());
 }
@@ -20,6 +25,8 @@ DOMUIBindings::DOMUIBindings() {
   BindMethod("send", &DOMUIBindings::send);
 }
 
+DOMUIBindings::~DOMUIBindings() {}
+
 void DOMUIBindings::send(const CppArgumentList& args, CppVariant* result) {
   // We expect at least a string message identifier, and optionally take
   // an object parameter.  If we get anything else we bail.
diff --git a/chrome/renderer/dom_ui_bindings.h b/chrome/renderer/dom_ui_bindings.h
index 4fb66a7..f2fdb71 100644
--- a/chrome/renderer/dom_ui_bindings.h
+++ b/chrome/renderer/dom_ui_bindings.h
@@ -14,9 +14,7 @@
 // in the browser process.
 class DOMBoundBrowserObject : public CppBoundClass {
  public:
-  DOMBoundBrowserObject()
-      : sender_(NULL),
-        routing_id_(0) { }
+  DOMBoundBrowserObject();
   virtual ~DOMBoundBrowserObject();
 
   // Set the message channel back to the browser.
@@ -59,7 +57,7 @@ class DOMBoundBrowserObject : public CppBoundClass {
 class DOMUIBindings : public DOMBoundBrowserObject {
  public:
   DOMUIBindings();
-  virtual ~DOMUIBindings() {}
+  virtual ~DOMUIBindings();
 
   // The send() function provided to Javascript.
   void send(const CppArgumentList& args, CppVariant* result);
diff --git a/chrome/renderer/navigation_state.cc b/chrome/renderer/navigation_state.cc
new file mode 100644
index 0000000..5cc19169
--- /dev/null
+++ b/chrome/renderer/navigation_state.cc
@@ -0,0 +1,54 @@
+// 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/renderer/navigation_state.h"
+
+#include "chrome/renderer/user_script_idle_scheduler.h"
+#include "webkit/glue/alt_error_page_resource_fetcher.h"
+#include "webkit/glue/password_form.h"
+
+NavigationState::~NavigationState() {}
+
+void NavigationState::set_user_script_idle_scheduler(
+    UserScriptIdleScheduler* scheduler) {
+  user_script_idle_scheduler_.reset(scheduler);
+}
+
+void NavigationState::set_password_form_data(webkit_glue::PasswordForm* data) {
+  password_form_data_.reset(data);
+}
+
+void NavigationState::set_alt_error_page_fetcher(
+    webkit_glue::AltErrorPageResourceFetcher* f) {
+  alt_error_page_fetcher_.reset(f);
+}
+
+NavigationState::NavigationState(PageTransition::Type transition_type,
+                                 const base::Time& request_time,
+                                 bool is_content_initiated,
+                                 int32 pending_page_id,
+                                 int pending_history_list_offset)
+    : transition_type_(transition_type),
+      load_type_(UNDEFINED_LOAD),
+      request_time_(request_time),
+      scheme_type_(static_cast<URLPattern::SchemeMasks>(0)),
+      load_histograms_recorded_(false),
+      request_committed_(false),
+      is_content_initiated_(is_content_initiated),
+      pending_page_id_(pending_page_id),
+      pending_history_list_offset_(pending_history_list_offset),
+      postpone_loading_data_(false),
+      cache_policy_override_set_(false),
+      cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy),
+      user_script_idle_scheduler_(NULL),
+      http_status_code_(0),
+      was_fetched_via_spdy_(false),
+      was_npn_negotiated_(false),
+      was_alternate_protocol_available_(false),
+      was_fetched_via_proxy_(false),
+      was_translated_(false),
+      was_within_same_page_(false),
+      was_prefetcher_(false),
+      was_referred_by_prefetcher_(false) {
+}
diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h
index d9cee3e..c280167 100644
--- a/chrome/renderer/navigation_state.h
+++ b/chrome/renderer/navigation_state.h
@@ -8,15 +8,20 @@
 
 #include <string>
 
+#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/page_transition_types.h"
-#include "chrome/renderer/user_script_idle_scheduler.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
-#include "webkit/glue/alt_error_page_resource_fetcher.h"
-#include "webkit/glue/password_form.h"
+
+namespace webkit_glue {
+struct PasswordForm;
+class AltErrorPageResourceFetcher;
+}
+
+class UserScriptIdleScheduler;
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
@@ -35,8 +40,7 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
     kLoadTypeMax               // Bounding value for this enum.
   };
 
-  virtual ~NavigationState() {
-  }
+  virtual ~NavigationState();
 
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
@@ -61,9 +65,7 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
   UserScriptIdleScheduler* user_script_idle_scheduler() {
     return user_script_idle_scheduler_.get();
   }
-  void set_user_script_idle_scheduler(UserScriptIdleScheduler* scheduler) {
-    user_script_idle_scheduler_.reset(scheduler);
-  }
+  void set_user_script_idle_scheduler(UserScriptIdleScheduler* scheduler);
 
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id() const { return pending_page_id_; }
@@ -184,16 +186,12 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
   webkit_glue::PasswordForm* password_form_data() const {
     return password_form_data_.get();
   }
-  void set_password_form_data(webkit_glue::PasswordForm* data) {
-    password_form_data_.reset(data);
-  }
+  void set_password_form_data(webkit_glue::PasswordForm* data);
 
   webkit_glue::AltErrorPageResourceFetcher* alt_error_page_fetcher() const {
     return alt_error_page_fetcher_.get();
   }
-  void set_alt_error_page_fetcher(webkit_glue::AltErrorPageResourceFetcher* f) {
-    alt_error_page_fetcher_.reset(f);
-  }
+  void set_alt_error_page_fetcher(webkit_glue::AltErrorPageResourceFetcher* f);
 
   const std::string& security_info() const { return security_info_; }
   void set_security_info(const std::string& security_info) {
@@ -277,30 +275,7 @@ class NavigationState : public WebKit::WebDataSource::ExtraData {
                   const base::Time& request_time,
                   bool is_content_initiated,
                   int32 pending_page_id,
-                  int pending_history_list_offset)
-      : transition_type_(transition_type),
-        load_type_(UNDEFINED_LOAD),
-        request_time_(request_time),
-        scheme_type_(static_cast<URLPattern::SchemeMasks>(0)),
-        load_histograms_recorded_(false),
-        request_committed_(false),
-        is_content_initiated_(is_content_initiated),
-        pending_page_id_(pending_page_id),
-        pending_history_list_offset_(pending_history_list_offset),
-        postpone_loading_data_(false),
-        cache_policy_override_set_(false),
-        cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy),
-        user_script_idle_scheduler_(NULL),
-        http_status_code_(0),
-        was_fetched_via_spdy_(false),
-        was_npn_negotiated_(false),
-        was_alternate_protocol_available_(false),
-        was_fetched_via_proxy_(false),
-        was_translated_(false),
-        was_within_same_page_(false),
-        was_prefetcher_(false),
-        was_referred_by_prefetcher_(false) {
-  }
+                  int pending_history_list_offset);
 
   PageTransition::Type transition_type_;
   LoadType load_type_;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 3955f27..5f45e1d 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -82,6 +82,7 @@
 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/speech_input_dispatcher.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
+#include "chrome/renderer/user_script_idle_scheduler.h"
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webplugin_delegate_pepper.h"
@@ -147,6 +148,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "v8/include/v8.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
+#include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/form_data.h"
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index 1048fed..d69e80a 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -75,6 +75,8 @@ FakeAudioOutputStream::FakeAudioOutputStream()
       closed_(false) {
 }
 
+FakeAudioOutputStream::~FakeAudioOutputStream() {}
+
 // static
 void FakeAudioOutputStream::DestroyLastFakeStream(void* param) {
   if (last_fake_stream_) {
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h
index 0914a1f..35aed2a 100644
--- a/media/audio/fake_audio_output_stream.h
+++ b/media/audio/fake_audio_output_stream.h
@@ -31,7 +31,7 @@ class FakeAudioOutputStream : public AudioOutputStream {
 
  private:
   FakeAudioOutputStream();
-  virtual ~FakeAudioOutputStream() {}
+  virtual ~FakeAudioOutputStream();
 
   static void DestroyLastFakeStream(void* param);
   static bool has_created_fake_stream_;
diff --git a/remoting/protocol/rtp_reader.cc b/remoting/protocol/rtp_reader.cc
index 4bc0b6c..a3659fb 100644
--- a/remoting/protocol/rtp_reader.cc
+++ b/remoting/protocol/rtp_reader.cc
@@ -9,9 +9,12 @@
 
 namespace remoting {
 
+RtpPacket::RtpPacket() {}
+RtpPacket::~RtpPacket() {}
+
 // RtpReader class.
-RtpReader::RtpReader() { }
-RtpReader::~RtpReader() { }
+RtpReader::RtpReader() {}
+RtpReader::~RtpReader() {}
 
 void RtpReader::Init(net::Socket* socket,
                      OnMessageCallback* on_message_callback) {
diff --git a/remoting/protocol/rtp_reader.h b/remoting/protocol/rtp_reader.h
index 4533756..b9a12df 100644
--- a/remoting/protocol/rtp_reader.h
+++ b/remoting/protocol/rtp_reader.h
@@ -12,6 +12,9 @@
 namespace remoting {
 
 struct RtpPacket {
+  RtpPacket();
+  ~RtpPacket();
+
   RtpHeader header;
   scoped_refptr<net::IOBuffer> data;
   char* payload;