prune down content_dll change to just the CONTENT_EXPORTS

content/browser/appcache/chrome_appcache_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #define CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/content_export.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/quota/special_storage_policy.h"
 
 class FilePath;
 
 namespace content {
 class ResourceContext;
 }
 
 // An AppCacheService subclass used by the chrome. There is an instance
 // associated with each BrowserContext. This derivation adds refcounting
 // semantics since a browser context has multiple URLRequestContexts which refer
 // to the same object, and those URLRequestContexts are refcounted independently
 // of the owning browser context.
 //
 // All methods, except the ctor, are expected to be called on
 // the IO thread (unless specifically called out in doc comments).
-class ChromeAppCacheService
+class CONTENT_EXPORT ChromeAppCacheService
     : public base::RefCountedThreadSafe<ChromeAppCacheService,
                                         BrowserThread::DeleteOnIOThread>,
-      public appcache::AppCacheService,
-      public appcache::AppCachePolicy,
+      NON_EXPORTED_BASE(public appcache::AppCacheService),

[darin (slow to review), 2011/09/04 15:41:04]

the risk here is that someone outside of content might start calling these
public base class methods.  that would then break linking in the component
build.  is it necessary to extend from AppCacheService, or can it be made a
member variable instead?  Alternatively, can it use private inheritance (against
the style guide rules, I know)?

actually, this is really only an issue for AppCacheService since AppCachePolicy
just has pure virtual methods.

[Dirk Pranke, 2011/09/07 01:46:07]

I will add a TODO for now and come back to this in a later patch.

+      NON_EXPORTED_BASE(public appcache::AppCachePolicy),
       public NotificationObserver {
  public:
   explicit ChromeAppCacheService(quota::QuotaManagerProxy* proxy);
 
   void InitializeOnIOThread(
       const FilePath& cache_path,  // may be empty to use in-memory structures
       const content::ResourceContext* resource_context,
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
 
  private:
+  friend base::RefCountedThreadSafe<ChromeAppCacheService,
+                                    BrowserThread::DeleteOnIOThread>;
   friend class BrowserThread;
   friend class DeleteTask<ChromeAppCacheService>;
 
   virtual ~ChromeAppCacheService();
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url);
   virtual int CanCreateAppCache(const GURL& manifest_url,
                                 net::CompletionCallback* callback);
 
   // NotificationObserver override
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   const content::ResourceContext* resource_context_;
   NotificationRegistrar registrar_;
   FilePath cache_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
 };
 
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_