Cleanup: Remove more unneeded ifdefs in chrome/browser/extensions.

Cleanup: Remove more unneeded ifdefs in chrome/browser/extensions.

Remove a non-const pass-by-reference while we are at it.

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

[Lei Zhang, 2014-08-14 21:28:06]

I thought I got them all in a previous CL, but there they are.

[Devlin, 2014-08-14 21:39:50]

lgtm

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
File chrome/browser/extensions/context_menu_matcher.cc (left):

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:25: int
GetActionMenuTopLevelLimit() {
could we just use ACTION_MENU_TOP_LEVEL_LIMIT directly now?

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
File chrome/browser/extensions/context_menu_matcher.cc (right):

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:9: #include
"chrome/browser/extensions/extension_service.h"
if you remove the service I commented on, don't need this anymore.

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:195: *extension =
service->GetExtensionById(extension_key.extension_id, false);
Since you're hear, mind changing this to
ExtensionRegistry::Get(browser_context_)->enabled_extensions().GetByID()?

[Lei Zhang, 2014-08-14 21:47:14]

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
File chrome/browser/extensions/context_menu_matcher.cc (left):

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:25: int
GetActionMenuTopLevelLimit() {
On 2014/08/14 21:39:50, Devlin wrote:
> could we just use ACTION_MENU_TOP_LEVEL_LIMIT directly now?

Done.

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
File chrome/browser/extensions/context_menu_matcher.cc (right):

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:9: #include
"chrome/browser/extensions/extension_service.h"
On 2014/08/14 21:39:49, Devlin wrote:
> if you remove the service I commented on, don't need this anymore.

Done.

https://codereview.chromium.org/470693003/diff/1/chrome/browser/extensions/co...
chrome/browser/extensions/context_menu_matcher.cc:195: *extension =
service->GetExtensionById(extension_key.extension_id, false);
On 2014/08/14 21:39:49, Devlin wrote:
> Since you're hear, mind changing this to
> ExtensionRegistry::Get(browser_context_)->enabled_extensions().GetByID()?

Done.

[Lei Zhang, 2014-08-14 22:36:39]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-14 22:39:33]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/470693003/40001

[commit-bot: I haz the power, 2014-08-15 04:53:22]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_aosp on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_aosp/bu...)

[commit-bot: I haz the power, 2014-08-15 05:39:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-15 05:39:29]

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

Patch:       chrome/browser/extensions/extension_service.cc
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc
b/chrome/browser/extensions/extension_service.cc
index
dee4596c0957a91fe46dd672bdb2ccb9b96c9ece..7415c55488c1fe6411a04f369c7179f838982807
100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -116,14 +116,12 @@ namespace {
 // Wait this many seconds after an extensions becomes idle before updating it.
 const int kUpdateIdleDelay = 5;
 
-#if defined(ENABLE_EXTENSIONS)
 scoped_ptr<IdentityProvider> CreateWebstoreIdentityProvider(Profile* profile) {
   return make_scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
       SigninManagerFactory::GetForProfile(profile),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       LoginUIServiceFactory::GetForProfile(profile)));
 }
-#endif  // defined(ENABLE_EXTENSIONS)
 
 }  // namespace
 
@@ -589,14 +587,12 @@ bool ExtensionService::UpdateExtension(const std::string&
id,
 scoped_ptr<ExtensionDownloader> ExtensionService::CreateExtensionDownloader(
     ExtensionDownloaderDelegate* delegate) {
   scoped_ptr<ExtensionDownloader> downloader;
-#if defined(ENABLE_EXTENSIONS)
   scoped_ptr<IdentityProvider> identity_provider =
       CreateWebstoreIdentityProvider(profile_);
   downloader.reset(new ExtensionDownloader(
       delegate,
       profile_->GetRequestContext()));
   downloader->SetWebstoreIdentityProvider(identity_provider.Pass());
-#endif
   return downloader.Pass();
 }

[Lei Zhang, 2014-08-15 19:11:18]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-15 19:18:22]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/470693003/60001

[commit-bot: I haz the power, 2014-08-15 23:49:12]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  android_dbg_triggered_tests on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tri...)

[commit-bot: I haz the power, 2014-08-16 01:09:38]

Committed patchset #4 (60001) as 290075