Start deinlining non-empty virtual methods. (This will be automatically checked

for in the future.)

BUG=none
TEST=compiles

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

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

14 files changed, 51 insertions, 25 deletions

diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 4286f4e..861db31 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -42,6 +42,8 @@ using webkit_glue::PasswordForm;
 
 // Importer.
 
+void Importer::Cancel() { cancelled_ = true; }
+
 Importer::Importer()
     : cancelled_(false),
       import_to_bookmark_bar_(false),
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index 7c527fa..515c58c 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -464,7 +464,7 @@ class Importer : public base::RefCountedThreadSafe<Importer> {
                            ImporterBridge* bridge) = 0;
 
   // Cancels the import process.
-  virtual void Cancel() { cancelled_ = true; }
+  virtual void Cancel();
 
   void set_import_to_bookmark_bar(bool import_to_bookmark_bar) {
     import_to_bookmark_bar_ = import_to_bookmark_bar;
diff --git a/chrome/common/net/gaia/gaia_authenticator.cc b/chrome/common/net/gaia/gaia_authenticator.cc
index 563ee3a..36d060e 100644
--- a/chrome/common/net/gaia/gaia_authenticator.cc
+++ b/chrome/common/net/gaia/gaia_authenticator.cc
@@ -196,6 +196,13 @@ bool GaiaAuthenticator::PerformGaiaRequest(const AuthParams& params,
   }
 }
 
+bool GaiaAuthenticator::Post(const GURL& url,
+                             const std::string& post_body,
+                             unsigned long* response_code,
+                             std::string* response_body) {
+  return false;
+}
+
 bool GaiaAuthenticator::LookupEmail(AuthResults* results) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   // Use the provided Gaia server, but change the path to what V1 expects.
@@ -238,6 +245,11 @@ bool GaiaAuthenticator::LookupEmail(AuthResults* results) {
   return false;
 }
 
+int GaiaAuthenticator::GetBackoffDelaySeconds(int current_backoff_delay) {
+  NOTREACHED();
+  return current_backoff_delay;
+}
+
 // We need to call this explicitly when we need to obtain a long-lived session
 // token.
 bool GaiaAuthenticator::IssueAuthToken(AuthResults* results,
diff --git a/chrome/common/net/gaia/gaia_authenticator.h b/chrome/common/net/gaia/gaia_authenticator.h
index 789863e..be1b2d9 100644
--- a/chrome/common/net/gaia/gaia_authenticator.h
+++ b/chrome/common/net/gaia/gaia_authenticator.h
@@ -180,9 +180,7 @@ class GaiaAuthenticator {
   virtual bool PerformGaiaRequest(const AuthParams& params,
                                   AuthResults* results);
   virtual bool Post(const GURL& url, const std::string& post_body,
-                    unsigned long* response_code, std::string* response_body) {
-    return false;
-  }
+                    unsigned long* response_code, std::string* response_body);
 
   // Caller should fill in results->LSID before calling. Result in
   // results->primary_email.
@@ -193,10 +191,7 @@ class GaiaAuthenticator {
   // TODO(sanjeevr): This should be made pure virtual. But this class is
   // currently directly being used in sync/engine/authenticator.cc, which is
   // wrong.
-  virtual int GetBackoffDelaySeconds(int current_backoff_delay) {
-    NOTREACHED();
-    return current_backoff_delay;
-  }
+  virtual int GetBackoffDelaySeconds(int current_backoff_delay);
 
  public:
   // Retrieve email.
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index ce32f67..59cea2b 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -139,6 +139,14 @@ ServiceURLRequestContext::ServiceURLRequestContext(
   accept_charset_ = "iso-8859-1,*,utf-8";
 }
 
+const std::string& ServiceURLRequestContext::GetUserAgent(
+    const GURL& url) const {
+  // If the user agent is set explicitly return that, otherwise call the
+  // base class method to return default value.
+  return user_agent_.empty() ?
+      URLRequestContext::GetUserAgent(url) : user_agent_;
+}
+
 ServiceURLRequestContext::~ServiceURLRequestContext() {
   delete ftp_transaction_factory_;
   delete http_transaction_factory_;
diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h
index a19e9f2..d1bb2bf 100644
--- a/chrome/service/net/service_url_request_context.h
+++ b/chrome/service/net/service_url_request_context.h
@@ -37,12 +37,7 @@ class ServiceURLRequestContext : public URLRequestContext {
   }
 
   // URLRequestContext overrides
-  virtual const std::string& GetUserAgent(const GURL& url) const {
-    // If the user agent is set explicitly return that, otherwise call the
-    // base class method to return default value.
-    return user_agent_.empty() ?
-        URLRequestContext::GetUserAgent(url) : user_agent_;
-  }
+  virtual const std::string& GetUserAgent(const GURL& url) const;
 
  protected:
   virtual ~ServiceURLRequestContext();
diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc
index 61ffb31..8cb167a 100644
--- a/chrome/worker/websharedworker_stub.cc
+++ b/chrome/worker/websharedworker_stub.cc
@@ -39,6 +39,10 @@ void WebSharedWorkerStub::OnChannelError() {
     OnTerminateWorkerContext();
 }
 
+const GURL& WebSharedWorkerStub::url() const {
+  return url_;
+}
+
 void WebSharedWorkerStub::OnStartWorkerContext(
     const GURL& url, const string16& user_agent, const string16& source_code) {
   // Ignore multiple attempts to start this worker (can happen if two pages
diff --git a/chrome/worker/websharedworker_stub.h b/chrome/worker/websharedworker_stub.h
index 157dadb..b9cb60c 100644
--- a/chrome/worker/websharedworker_stub.h
+++ b/chrome/worker/websharedworker_stub.h
@@ -25,7 +25,7 @@ class WebSharedWorkerStub : public WebWorkerStubBase {
   virtual void OnMessageReceived(const IPC::Message& message);
   virtual void OnChannelError();
 
-  virtual const GURL& url() const { return url_; }
+  virtual const GURL& url() const;
 
  private:
   virtual ~WebSharedWorkerStub();
diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc
index 78d980e..cd58cab 100644
--- a/chrome/worker/webworker_stub.cc
+++ b/chrome/worker/webworker_stub.cc
@@ -56,6 +56,10 @@ void WebWorkerStub::OnChannelError() {
     OnTerminateWorkerContext();
 }
 
+const GURL& WebWorkerStub::url() const {
+  return url_;
+}
+
 void WebWorkerStub::OnMessageReceived(const IPC::Message& message) {
   if (!impl_)
     return;
diff --git a/chrome/worker/webworker_stub.h b/chrome/worker/webworker_stub.h
index 584abce..76e1058 100644
--- a/chrome/worker/webworker_stub.h
+++ b/chrome/worker/webworker_stub.h
@@ -25,7 +25,7 @@ class WebWorkerStub : public WebWorkerStubBase {
   virtual void OnMessageReceived(const IPC::Message& message);
   virtual void OnChannelError();
 
-  virtual const GURL& url() const { return url_; }
+  virtual const GURL& url() const;
 
  private:
   virtual ~WebWorkerStub();
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 6df7341..adb9b9b8 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -117,6 +117,14 @@ WebKit::WebWorker* WebWorkerClientProxy::createWorker(
                             0, appcache_host_id_);
 }
 
+WebKit::WebNotificationPresenter*
+WebWorkerClientProxy::notificationPresenter() {
+  // TODO(johnnyg): Notifications are not yet hooked up to workers.
+  // Coming soon.
+  NOTREACHED();
+  return NULL;
+}
+
 WebApplicationCacheHost* WebWorkerClientProxy::createApplicationCacheHost(
     WebKit::WebApplicationCacheHostClient* client) {
   WorkerWebApplicationCacheHostImpl* host =
diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h
index 53f8c67..555742e 100644
--- a/chrome/worker/webworkerclient_proxy.h
+++ b/chrome/worker/webworkerclient_proxy.h
@@ -64,12 +64,7 @@ class WebWorkerClientProxy : public WebKit::WebWorkerClient {
   virtual void workerContextDestroyed();
   virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client);
 
-  virtual WebKit::WebNotificationPresenter* notificationPresenter() {
-    // TODO(johnnyg): Notifications are not yet hooked up to workers.
-    // Coming soon.
-    NOTREACHED();
-    return NULL;
-  }
+  virtual WebKit::WebNotificationPresenter* notificationPresenter();
 
   virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
       WebKit::WebApplicationCacheHostClient* client);
diff --git a/chrome/worker/worker_webapplicationcachehost_impl.cc b/chrome/worker/worker_webapplicationcachehost_impl.cc
index 2bf718a..fc0d282 100644
--- a/chrome/worker/worker_webapplicationcachehost_impl.cc
+++ b/chrome/worker/worker_webapplicationcachehost_impl.cc
@@ -20,3 +20,8 @@ WorkerWebApplicationCacheHostImpl::WorkerWebApplicationCacheHostImpl(
                                     init_info.parent_process_id,
                                     init_info.parent_appcache_host_id);
 }
+
+bool WorkerWebApplicationCacheHostImpl::selectCacheWithManifest(
+    const WebKit::WebURL& manifestURL) {
+  return true;
+}
diff --git a/chrome/worker/worker_webapplicationcachehost_impl.h b/chrome/worker/worker_webapplicationcachehost_impl.h
index 3508fc4..db6dc8a 100644
--- a/chrome/worker/worker_webapplicationcachehost_impl.h
+++ b/chrome/worker/worker_webapplicationcachehost_impl.h
@@ -45,9 +45,7 @@ class WorkerWebApplicationCacheHostImpl
   // Cache selection is also different for workers. We know at construction
   // time what cache to select and do so then.
   virtual void selectCacheWithoutManifest() {}
-  virtual bool selectCacheWithManifest(const WebKit::WebURL& manifestURL) {
-    return true;
-  }
+  virtual bool selectCacheWithManifest(const WebKit::WebURL& manifestURL);
 };
 
 #endif  // CHROME_WORKER_WORKER_WEBAPPLICATIONCACHEHOST_IMPL_H_