Remove some Profile-keyed factory boilerplate: management omnibox preference push_messaging.

Remove some Profile-keyed factory boilerplate: management, omnibox, preference, push_messaging. Change ProfileKeyedAPIFactory<Foo>::GetInstance to Foo::GetFactoryInstance.

BUG=159265
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175555

[Jeffrey Yasskin, 2013-01-03 23:10:42]

Your CL description could use some commas, but otherwise LGTM.

https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
File chrome/browser/extensions/api/management/management_api.h (right):

https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
chrome/browser/extensions/api/management/management_api.h:197:
ProfileKeyedAPIFactory<ManagementAPI>::GetInstance();
Late question: Why does this need to be a method on
ProfileKeyedAPIFactory<ManagementAPI> instead of on ManagementAPI? Defining a
static method "ProfileKeyedAPIFactory<ManagementAPI>*
ManagementAPI::GetFactoryInstance()" would avoid some inscrutable template
syntax.

[Yoyo Zhou, 2013-01-03 23:52:58]

now with more punctuation

https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
File chrome/browser/extensions/api/management/management_api.h (right):

https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
chrome/browser/extensions/api/management/management_api.h:197:
ProfileKeyedAPIFactory<ManagementAPI>::GetInstance();
On 2013/01/03 23:10:42, Jeffrey Yasskin wrote:
> Late question: Why does this need to be a method on
> ProfileKeyedAPIFactory<ManagementAPI> instead of on ManagementAPI? Defining a
> static method "ProfileKeyedAPIFactory<ManagementAPI>*
> ManagementAPI::GetFactoryInstance()" would avoid some inscrutable template
> syntax.

Good question. I think that's something I would add to the template also, so
I'll change it in the next CL.

[commit-bot: I haz the power, 2013-01-04 00:15:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/11682005/2001

[commit-bot: I haz the power, 2013-01-04 00:16:02]

Failed to apply patch for chrome/browser/profiles/profile_dependency_manager.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/profiles/profile_dependency_manager.cc
  Hunk #1 FAILED at 24.
  Hunk #2 FAILED at 259.
  2 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/profiles/profile_dependency_manager.cc.rej

Patch:       chrome/browser/profiles/profile_dependency_manager.cc
Index: chrome/browser/profiles/profile_dependency_manager.cc
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc
b/chrome/browser/profiles/profile_dependency_manager.cc
index
26b83e26b4b9f3cb3d850c342ca0cc84e02bfb69..55eba64fd3d7d38e9aa3fb0d4eab892eb0e0dd49
100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -24,13 +24,13 @@
 #include "chrome/browser/extensions/api/history/history_api_factory.h"
 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
 #include
"chrome/browser/extensions/api/managed_mode/managed_mode_api_factory.h"
-#include "chrome/browser/extensions/api/management/management_api_factory.h"
+#include "chrome/browser/extensions/api/management/management_api.h"
 #include
"chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api_factory.h"
-#include "chrome/browser/extensions/api/omnibox/omnibox_api_factory.h"
-#include "chrome/browser/extensions/api/preference/preference_api_factory.h"
+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
+#include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/extensions/api/processes/processes_api.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
-#include
"chrome/browser/extensions/api/push_messaging/push_messaging_api_factory.h"
+#include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
 #include
"chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include
"chrome/browser/extensions/api/web_navigation/web_navigation_api_factory.h"
@@ -259,15 +259,16 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
 #endif
   extensions::ManagedModeAPIFactory::GetInstance();
   extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
-  extensions::OmniboxAPIFactory::GetInstance();
-  extensions::PreferenceAPIFactory::GetInstance();
+  extensions::ProfileKeyedAPIFactory<extensions::ManagementAPI>::GetInstance();
+  extensions::ProfileKeyedAPIFactory<extensions::OmniboxAPI>::GetInstance();
+  extensions::ProfileKeyedAPIFactory<extensions::PreferenceAPI>::GetInstance();
   extensions::ProfileKeyedAPIFactory<extensions::ProcessesAPI>::GetInstance();
+  extensions::ProfileKeyedAPIFactory<extensions::PushMessagingAPI>::
+      GetInstance();
  
extensions::ProfileKeyedAPIFactory<extensions::TabsWindowsAPI>::GetInstance();
-  extensions::PushMessagingAPIFactory::GetInstance();
   extensions::SuggestedLinksRegistryFactory::GetInstance();
   extensions::TabCaptureRegistryFactory::GetInstance();
   extensions::WebNavigationAPIFactory::GetInstance();
-  ExtensionManagementAPIFactory::GetInstance();
 #endif
   FaviconServiceFactory::GetInstance();
 #if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION)

[Yoyo Zhou, 2013-01-04 20:03:44]

On 2013/01/03 23:52:58, Yoyo Zhou wrote:
> now with more punctuation
> 
>
https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
> File chrome/browser/extensions/api/management/management_api.h (right):
> 
>
https://chromiumcodereview.appspot.com/11682005/diff/2001/chrome/browser/exte...
> chrome/browser/extensions/api/management/management_api.h:197:
> ProfileKeyedAPIFactory<ManagementAPI>::GetInstance();
> On 2013/01/03 23:10:42, Jeffrey Yasskin wrote:
> > Late question: Why does this need to be a method on
> > ProfileKeyedAPIFactory<ManagementAPI> instead of on ManagementAPI? Defining
a
> > static method "ProfileKeyedAPIFactory<ManagementAPI>*
> > ManagementAPI::GetFactoryInstance()" would avoid some inscrutable template
> > syntax.
> 
> Good question. I think that's something I would add to the template also, so
> I'll change it in the next CL.

Actually I decided to change it in this CL instead.

There doesn't seem to be a way to declare
class ProfileKeyedAPI {
  static virtual ProfileKeyedAPIFactory<SomeTemplateMagic> GetFactoryInstance()
= 0;
};

such that the derived class has to override it with the
ProfileKeyedAPIFactory<DerivedClass> signature, is there?

Otherwise, GetFactoryInstance will only appear in the documentation comment in
profile_keyed_api_factory.h.

[Jeffrey Yasskin, 2013-01-04 21:18:13]

On Fri, Jan 4, 2013 at 12:03 PM,  <yoz@chromium.org> wrote:
> Actually I decided to change it in this CL instead.
>
> There doesn't seem to be a way to declare
> class ProfileKeyedAPI {
>   static virtual ProfileKeyedAPIFactory<SomeTemplateMagic>
> GetFactoryInstance()
> = 0;
> };
>
> such that the derived class has to override it with the
> ProfileKeyedAPIFactory<DerivedClass> signature, is there?

Right. With concepts we could probably do it, but C++ doesn't have concepts
yet.

> Otherwise, GetFactoryInstance will only appear in the documentation comment
> in
> profile_keyed_api_factory.h.

Right. I think that's ok.

> https://chromiumcodereview.appspot.com/11682005/

[Yoyo Zhou, 2013-01-04 22:34:40]

Implemented as described.

jyasskin: another look?

+mirandac: can you look at profiles?

ben: TBRing for gyp changes (deleting files)

[Jeffrey Yasskin, 2013-01-04 22:39:23]

lgtm

https://chromiumcodereview.appspot.com/11682005/diff/24001/chrome/browser/ext...
File chrome/browser/extensions/api/input_ime/input_ime_api.h (right):

https://chromiumcodereview.appspot.com/11682005/diff/24001/chrome/browser/ext...
chrome/browser/extensions/api/input_ime/input_ime_api.h:183: static
ProfileKeyedAPIFactory<InputImeAPI>* GetInstance();
GetInstance or GetFactoryInstance?

[Yoyo Zhou, 2013-01-04 22:43:31]

https://chromiumcodereview.appspot.com/11682005/diff/24001/chrome/browser/ext...
File chrome/browser/extensions/api/input_ime/input_ime_api.h (right):

https://chromiumcodereview.appspot.com/11682005/diff/24001/chrome/browser/ext...
chrome/browser/extensions/api/input_ime/input_ime_api.h:183: static
ProfileKeyedAPIFactory<InputImeAPI>* GetInstance();
On 2013/01/04 22:39:23, Jeffrey Yasskin wrote:
> GetInstance or GetFactoryInstance?

oops.

[Yoyo Zhou, 2013-01-05 00:06:13]

I had to make a tweak to the factory template to support PushMessagingAPI not
being created at profile startup.

[Miranda Callahan, 2013-01-07 14:09:55]

On 2013/01/05 00:06:13, Yoyo Zhou wrote:
> I had to make a tweak to the factory template to support PushMessagingAPI not
> being created at profile startup.

profile_dependency_manager LGTM.

[commit-bot: I haz the power, 2013-01-07 17:01:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/11682005/31007

[commit-bot: I haz the power, 2013-01-07 17:01:59]

Failed to apply patch for
chrome/browser/extensions/api/push_messaging/push_messaging_api.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/extensions/api/push_messaging/push_messaging_api.h
  Hunk #3 FAILED at 114.
  Hunk #4 succeeded at 124 (offset -2 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/extensions/api/push_messaging/push_messaging_api.h.rej

Patch:       chrome/browser/extensions/api/push_messaging/push_messaging_api.h
Index: chrome/browser/extensions/api/push_messaging/push_messaging_api.h
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
index
ac57fb9a946fb030b1db4944945cda40819235bf..939b5d67fb6b7dc9c63dc8be20c6638a041c260c
100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.h
@@ -11,10 +11,10 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include
"chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h"
 #include
"chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -103,7 +103,7 @@ class PushMessagingGetChannelIdFunction
   DISALLOW_COPY_AND_ASSIGN(PushMessagingGetChannelIdFunction);
 };
 
-class PushMessagingAPI : public ProfileKeyedService {
+class PushMessagingAPI : public ProfileKeyedAPI {
  public:
   explicit PushMessagingAPI(Profile* profile);
   virtual ~PushMessagingAPI();
@@ -114,10 +114,22 @@ class PushMessagingAPI : public ProfileKeyedService {
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
+  // ProfileKeyedAPI implementation.
+  static ProfileKeyedAPIFactory<PushMessagingAPI>* GetFactoryInstance();
+
   // For testing purposes.
   PushMessagingEventRouter* GetEventRouterForTest();
 
  private:
+  friend class ProfileKeyedAPIFactory<PushMessagingAPI>;
+
+  // ProfileKeyedAPI implementation.
+  static const char* service_name() {
+    return "PushMessagingAPI";
+  }
+  static const bool kServiceIsCreatedWithProfile = false;
+  static const bool kServiceIsNULLWhileTesting = true;
+
   void InitializeEventRouter();
 
   // Created at ExtensionService startup.
@@ -126,6 +138,9 @@ class PushMessagingAPI : public ProfileKeyedService {
   DISALLOW_COPY_AND_ASSIGN(PushMessagingAPI);
 };
 
-}  // namespace extension
+template <>
+void ProfileKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies();
+
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_PUSH_MESSAGING_PUSH_MESSAGING_API_H__

[Ben Goodger (Google), 2013-01-07 18:07:17]

gyp lgtm

[commit-bot: I haz the power, 2013-01-07 20:02:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/11682005/33005

[commit-bot: I haz the power, 2013-01-07 21:37:18]

Retried try job too often on win_aura for step(s) interactive_ui_tests

[commit-bot: I haz the power, 2013-01-08 01:28:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/11682005/33005

[commit-bot: I haz the power, 2013-01-08 16:02:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/11682005/33005

[commit-bot: I haz the power, 2013-01-08 18:22:12]

Change committed as 175555