Keep deinlining stuff.

BUG=none
TEST=compiles

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

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

5 files changed, 68 insertions, 39 deletions

diff --git a/chrome/browser/automation/automation_autocomplete_edit_tracker.cc b/chrome/browser/automation/automation_autocomplete_edit_tracker.cc
new file mode 100644
index 0000000..e34e26f
--- /dev/null
+++ b/chrome/browser/automation/automation_autocomplete_edit_tracker.cc
@@ -0,0 +1,28 @@
+// 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/automation/automation_autocomplete_edit_tracker.h"
+
+#include "chrome/common/notification_source.h"
+#include "chrome/common/notification_type.h"
+
+AutomationAutocompleteEditTracker::AutomationAutocompleteEditTracker(
+    IPC::Message::Sender* automation)
+    : AutomationResourceTracker<AutocompleteEditView*>(automation) {
+}
+
+AutomationAutocompleteEditTracker::~AutomationAutocompleteEditTracker() {
+}
+
+void AutomationAutocompleteEditTracker::AddObserver(
+    AutocompleteEditView* resource) {
+  registrar_.Add(this, NotificationType::AUTOCOMPLETE_EDIT_DESTROYED,
+                 Source<AutocompleteEditView>(resource));
+}
+
+void AutomationAutocompleteEditTracker::RemoveObserver(
+    AutocompleteEditView* resource) {
+  registrar_.Remove(this, NotificationType::AUTOCOMPLETE_EDIT_DESTROYED,
+                    Source<AutocompleteEditView>(resource));
+}
diff --git a/chrome/browser/automation/automation_autocomplete_edit_tracker.h b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
index 2394b89..0e0a4ed 100644
--- a/chrome/browser/automation/automation_autocomplete_edit_tracker.h
+++ b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
@@ -8,27 +8,14 @@
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/automation/automation_resource_tracker.h"
-#include "chrome/common/notification_source.h"
-#include "chrome/common/notification_type.h"
 
 class AutomationAutocompleteEditTracker
     : public AutomationResourceTracker<AutocompleteEditView*> {
  public:
-  explicit AutomationAutocompleteEditTracker(IPC::Message::Sender* automation)
-      : AutomationResourceTracker<AutocompleteEditView*>(automation) { }
-
-  virtual ~AutomationAutocompleteEditTracker() {
-  }
-
-  virtual void AddObserver(AutocompleteEditView* resource) {
-    registrar_.Add(this, NotificationType::AUTOCOMPLETE_EDIT_DESTROYED,
-                   Source<AutocompleteEditView>(resource));
-  }
-
-  virtual void RemoveObserver(AutocompleteEditView* resource) {
-    registrar_.Remove(this, NotificationType::AUTOCOMPLETE_EDIT_DESTROYED,
-                      Source<AutocompleteEditView>(resource));
-  }
+  explicit AutomationAutocompleteEditTracker(IPC::Message::Sender* automation);
+  virtual ~AutomationAutocompleteEditTracker();
+  virtual void AddObserver(AutocompleteEditView* resource);
+  virtual void RemoveObserver(AutocompleteEditView* resource);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
diff --git a/chrome/browser/automation/automation_browser_tracker.cc b/chrome/browser/automation/automation_browser_tracker.cc
new file mode 100644
index 0000000..3000e44
--- /dev/null
+++ b/chrome/browser/automation/automation_browser_tracker.cc
@@ -0,0 +1,24 @@
+// 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/automation/automation_browser_tracker.h"
+
+#include "chrome/common/notification_source.h"
+
+AutomationBrowserTracker::AutomationBrowserTracker(
+    IPC::Message::Sender* automation)
+    : AutomationResourceTracker<Browser*>(automation) {
+}
+
+AutomationBrowserTracker::~AutomationBrowserTracker() {}
+
+void AutomationBrowserTracker::AddObserver(Browser* resource) {
+  registrar_.Add(this, NotificationType::BROWSER_CLOSED,
+                 Source<Browser>(resource));
+}
+
+void AutomationBrowserTracker::RemoveObserver(Browser* resource) {
+  registrar_.Remove(this, NotificationType::BROWSER_CLOSED,
+                    Source<Browser>(resource));
+}
diff --git a/chrome/browser/automation/automation_browser_tracker.h b/chrome/browser/automation/automation_browser_tracker.h
index 88d95b5..f3c8d3b 100644
--- a/chrome/browser/automation/automation_browser_tracker.h
+++ b/chrome/browser/automation/automation_browser_tracker.h
@@ -7,25 +7,16 @@
 #pragma once
 
 #include "chrome/browser/automation/automation_resource_tracker.h"
-#include "chrome/common/notification_source.h"
 
 class Browser;
 
 // Tracks Browser objects.
 class AutomationBrowserTracker : public AutomationResourceTracker<Browser*> {
  public:
-  explicit AutomationBrowserTracker(IPC::Message::Sender* automation)
-      : AutomationResourceTracker<Browser*>(automation) { }
-
-  virtual void AddObserver(Browser* resource) {
-    registrar_.Add(this, NotificationType::BROWSER_CLOSED,
-                   Source<Browser>(resource));
-  }
-
-  virtual void RemoveObserver(Browser* resource) {
-    registrar_.Remove(this, NotificationType::BROWSER_CLOSED,
-                      Source<Browser>(resource));
-  }
+  explicit AutomationBrowserTracker(IPC::Message::Sender* automation);
+  virtual ~AutomationBrowserTracker();
+  virtual void AddObserver(Browser* resource);
+  virtual void RemoveObserver(Browser* resource);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_BROWSER_TRACKER_H__
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 12fd431..4386ba9 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -437,15 +437,14 @@ void URLRequestAutomationJob::StartAsync() {
   }
 
   // Ask automation to start this request.
-  IPC::AutomationURLRequest automation_request = {
-    request_->url().spec(),
-    request_->method(),
-    referrer.spec(),
-    new_request_headers.ToString(),
-    request_->get_upload(),
-    resource_type,
-    request_->load_flags()
-  };
+  IPC::AutomationURLRequest automation_request(
+      request_->url().spec(),
+      request_->method(),
+      referrer.spec(),
+      new_request_headers.ToString(),
+      request_->get_upload(),
+      resource_type,
+      request_->load_flags());
 
   DCHECK(message_filter_);
   message_filter_->Send(new AutomationMsg_RequestStart(0, tab_, id_,