Fix stability and data racing issues, coalesce more updates for JumpList

chrome/browser/win/jumplist_factory.h

Index: chrome/browser/win/jumplist_factory.h
diff --git a/chrome/browser/win/jumplist_factory.h b/chrome/browser/win/jumplist_factory.h
index 5f8c1c80180dc5fdf67eebf8ddd68570879ac593..2d61dd60a5f61850a6529b2cc63caa181a506ef4 100644
--- a/chrome/browser/win/jumplist_factory.h
+++ b/chrome/browser/win/jumplist_factory.h
@@ -7,11 +7,11 @@
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/win/jumplist.h"

[grt (UTC plus 2), 2017/06/12 20:43:39]

nit: could this be moved to the .cc file in favor of a forward-decl?

[chengx, 2017/06/12 22:05:30]

I don't think so. The return type of GetForProfile is JumpList*. So the
definition of JumpList is needed in this header file. 

[grt (UTC plus 2), 2017/06/13 07:32:27]

A forward decl is fine in that case -- consumers of this .h only need to know
that "JumpList" is a class. They will need to include jumplist.h only if they
wish to dereference the pointer.

[chengx, 2017/06/13 19:16:01]

Done. You are right. I only need to tell the header file that JumpList is a
class. Thanks!

-#include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h"
+#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
-class JumpListFactory : public RefcountedBrowserContextKeyedServiceFactory {
+class JumpListFactory : public BrowserContextKeyedServiceFactory {
  public:
-  static scoped_refptr<JumpList> GetForProfile(Profile* profile);
+  static JumpList* GetForProfile(Profile* profile);
 
   static JumpListFactory* GetInstance();
 
@@ -21,7 +21,7 @@ class JumpListFactory : public RefcountedBrowserContextKeyedServiceFactory {
   ~JumpListFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  scoped_refptr<RefcountedKeyedService> BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 };