Move the InputComponents out of extensions entirely.

Move the InputComponents out of extensions entirely.

BUG=159265
TEST=ExtensionApiTest.InputImeApiBasic
TBR=ben@chromium.org

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

[SanjoyPal, 2012-12-27 03:10:14]

Please review.

[Joe Thomas, 2012-12-27 16:04:37]

Hi Sanjoy,

Some of the changes that you made in this CL are already landed in
https://chromiumcodereview.appspot.com/11618005.

Also you missed to include extension.cc/h files to your CL.

Thanks!

[SanjoyPal, 2012-12-27 19:58:25]

On 2012/12/27 16:04:37, Joe Thomas wrote:
> Hi Sanjoy,
> 
> Some of the changes that you made in this CL are already landed in
> https://chromiumcodereview.appspot.com/11618005.
> 
> Also you missed to include extension.cc/h files to your CL.
> 
> Thanks!

I rebased the patch and also made the changes for ProfileKeyedAPIFactory
template for InputImeAPI.
PTAL. Thanks.

[Yoyo Zhou, 2012-12-28 21:04:28]

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/exte...
File chrome/browser/extensions/api/input_ime/input_ime_api.cc (right):

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/exte...
chrome/browser/extensions/api/input_ime/input_ime_api.cc:873: if
(extensions::InputComponents::GetInputComponents(extension) == NULL)
You should assign the InputComponents to a temporary variable to avoid this
unwieldy code. Also, NULL-checks are usually written
if (!foo)

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/exte...
File chrome/browser/extensions/api/input_ime/input_ime_api.h (right):

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/exte...
chrome/browser/extensions/api/input_ime/input_ime_api.h:194: }
You need kServiceIsNULLWhileTesting = true; to get the same behavior as now.
Also you need a newline after.

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/prof...
File chrome/browser/profiles/profile_dependency_manager.cc (right):

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/browser/prof...
chrome/browser/profiles/profile_dependency_manager.cc:257:
extensions::ProfileKeyedAPIFactory<extensions::InputImeAPI>::GetInstance();
Keep this list in alphabetical order (even if it means you need to make some new
ifdef blocks).

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/common/exten...
File chrome/common/extensions/api/input_ime/input_components_handler.cc (right):

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/common/exten...
chrome/common/extensions/api/input_ime/input_components_handler.cc:42:
Extension* extension,
fix indent

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/common/exten...
File chrome/common/extensions/api/input_ime/input_components_handler.h (right):

https://chromiumcodereview.appspot.com/11611004/diff/5003/chrome/common/exten...
chrome/common/extensions/api/input_ime/input_components_handler.h:45: // Returns
list of input components.
"and associated properties" to match the deleted comment.

(If all this comment said was what it says right now, it should just be
deleted.)

[SanjoyPal, 2012-12-28 22:38:25]

Fixed the comments. Please review.

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/extensions/...
File chrome/browser/extensions/api/input_ime/input_ime_api.cc (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/extensions/...
chrome/browser/extensions/api/input_ime/input_ime_api.cc:873: if
(extensions::InputComponents::GetInputComponents(extension) == NULL)
On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> You should assign the InputComponents to a temporary variable to avoid this
> unwieldy code. Also, NULL-checks are usually written
> if (!foo)

Done.

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/extensions/...
File chrome/browser/extensions/api/input_ime/input_ime_api.h (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/extensions/...
chrome/browser/extensions/api/input_ime/input_ime_api.h:194: }
On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> You need kServiceIsNULLWhileTesting = true; to get the same behavior as now.
> Also you need a newline after.

Done.

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/profiles/pr...
File chrome/browser/profiles/profile_dependency_manager.cc (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/browser/profiles/pr...
chrome/browser/profiles/profile_dependency_manager.cc:257:
extensions::ProfileKeyedAPIFactory<extensions::InputImeAPI>::GetInstance();
On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> Keep this list in alphabetical order (even if it means you need to make some
new
> ifdef blocks).

Done.

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
File chrome/common/extensions/api/input_ime/input_components_handler.cc (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
chrome/common/extensions/api/input_ime/input_components_handler.cc:42:
Extension* extension,
On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> fix indent

Done.

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
File chrome/common/extensions/api/input_ime/input_components_handler.h (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
chrome/common/extensions/api/input_ime/input_components_handler.h:45: // Returns
list of input components.
On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> "and associated properties" to match the deleted comment.
> 
> (If all this comment said was what it says right now, it should just be
> deleted.)

Done.

[Yoyo Zhou, 2013-01-03 01:21:59]

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
File chrome/common/extensions/api/input_ime/input_components_handler.h (right):

https://codereview.chromium.org/11611004/diff/5003/chrome/common/extensions/a...
chrome/common/extensions/api/input_ime/input_components_handler.h:45: // Returns
list of input components.
On 2012/12/28 22:38:30, SanjoyPal wrote:
> On 2012/12/28 21:04:28, Yoyo Zhou wrote:
> > "and associated properties" to match the deleted comment.
> > 
> > (If all this comment said was what it says right now, it should just be
> > deleted.)
> 
> Done.

What I meant was you should add "and associated properties" to the comment, not
that you should delete it.

https://codereview.chromium.org/11611004/diff/21001/chrome/browser/extensions...
File chrome/browser/extensions/api/input_ime/input_ime_api.cc (right):

https://codereview.chromium.org/11611004/diff/21001/chrome/browser/extensions...
chrome/browser/extensions/api/input_ime/input_ime_api.cc:878:
components->input_components.begin(); component != components->
please break the newline after the semicolon.

[SanjoyPal, 2013-01-03 01:33:01]

Updated the patch. Please review.

https://codereview.chromium.org/11611004/diff/21001/chrome/browser/extensions...
File chrome/browser/extensions/api/input_ime/input_ime_api.cc (right):

https://codereview.chromium.org/11611004/diff/21001/chrome/browser/extensions...
chrome/browser/extensions/api/input_ime/input_ime_api.cc:878:
components->input_components.begin(); component != components->
On 2013/01/03 01:21:59, Yoyo Zhou wrote:
> please break the newline after the semicolon.

Done.

[Yoyo Zhou, 2013-01-03 01:36:43]

LGTM, thanks.

[SanjoyPal, 2013-01-03 01:50:42]

Hi Miranda, please review the profile changes. Thanks.

[Miranda Callahan, 2013-01-03 13:52:32]

On 2013/01/03 01:50:42, SanjoyPal wrote:
> Hi Miranda, please review the profile changes. Thanks.

Hi, Sanjoy -- PDM changes LGTM.

[commit-bot: I haz the power, 2013-01-03 15:59:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/42001

[commit-bot: I haz the power, 2013-01-03 15:59:40]

Failed to apply patch for chrome/browser/profiles/profile_dependency_manager.cc:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/profiles/profile_dependency_manager.cc
  Hunk #2 FAILED at 254.
  1 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
===================================================================
--- chrome/browser/profiles/profile_dependency_manager.cc	(revision 174689)
+++ chrome/browser/profiles/profile_dependency_manager.cc	(working copy)
@@ -86,7 +86,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/input_method_api_factory.h"
-#include "chrome/browser/extensions/api/input_ime/input_ime_api_factory.h"
+#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #if defined(FILE_MANAGER_EXTENSION)
 #include
"chrome/browser/chromeos/extensions/file_browser_private_api_factory.h"
 #endif
@@ -254,13 +254,15 @@
   extensions::HistoryAPIFactory::GetInstance();
   extensions::IdleManagerFactory::GetInstance();
 #if defined(OS_CHROMEOS)
-  extensions::InputImeAPIFactory::GetInstance();
   extensions::InputMethodAPIFactory::GetInstance();
 #endif
   extensions::ManagedModeAPIFactory::GetInstance();
   extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
   extensions::OmniboxAPIFactory::GetInstance();
   extensions::PreferenceAPIFactory::GetInstance();
+#if defined(OS_CHROMEOS)
+  extensions::ProfileKeyedAPIFactory<extensions::InputImeAPI>::GetInstance();
+#endif
   extensions::ProfileKeyedAPIFactory<extensions::ProcessesAPI>::GetInstance();
  
extensions::ProfileKeyedAPIFactory<extensions::TabsWindowsAPI>::GetInstance();
   extensions::PushMessagingAPIFactory::GetInstance();

[commit-bot: I haz the power, 2013-01-03 18:07:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/39005

[SanjoyPal, 2013-01-03 18:08:36]

Solved the conflict.

On 2013/01/03 15:59:40, I haz the power (commit-bot) wrote:
> Failed to apply patch for
chrome/browser/profiles/profile_dependency_manager.cc:
> While running patch -p0 --forward --force --no-backup-if-mismatch;
>   patching file chrome/browser/profiles/profile_dependency_manager.cc
>   Hunk #2 FAILED at 254.
>   1 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
> ===================================================================
> --- chrome/browser/profiles/profile_dependency_manager.cc	(revision 174689)
> +++ chrome/browser/profiles/profile_dependency_manager.cc	(working copy)
> @@ -86,7 +86,7 @@
>  
>  #if defined(OS_CHROMEOS)
>  #include "chrome/browser/chromeos/extensions/input_method_api_factory.h"
> -#include "chrome/browser/extensions/api/input_ime/input_ime_api_factory.h"
> +#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
>  #if defined(FILE_MANAGER_EXTENSION)
>  #include
> "chrome/browser/chromeos/extensions/file_browser_private_api_factory.h"
>  #endif
> @@ -254,13 +254,15 @@
>    extensions::HistoryAPIFactory::GetInstance();
>    extensions::IdleManagerFactory::GetInstance();
>  #if defined(OS_CHROMEOS)
> -  extensions::InputImeAPIFactory::GetInstance();
>    extensions::InputMethodAPIFactory::GetInstance();
>  #endif
>    extensions::ManagedModeAPIFactory::GetInstance();
>    extensions::MediaGalleriesPrivateAPIFactory::GetInstance();
>    extensions::OmniboxAPIFactory::GetInstance();
>    extensions::PreferenceAPIFactory::GetInstance();
> +#if defined(OS_CHROMEOS)
> +  extensions::ProfileKeyedAPIFactory<extensions::InputImeAPI>::GetInstance();
> +#endif
>   
extensions::ProfileKeyedAPIFactory<extensions::ProcessesAPI>::GetInstance();
>   
> extensions::ProfileKeyedAPIFactory<extensions::TabsWindowsAPI>::GetInstance();
>    extensions::PushMessagingAPIFactory::GetInstance();

[commit-bot: I haz the power, 2013-01-03 18:35:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/42006

[commit-bot: I haz the power, 2013-01-03 18:49:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/40007

[commit-bot: I haz the power, 2013-01-03 19:46:52]

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

[commit-bot: I haz the power, 2013-01-03 22:28:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/45021

[commit-bot: I haz the power, 2013-01-04 01:49:40]

Retried try job too often on win_rel for step(s) unit_tests

[commit-bot: I haz the power, 2013-01-04 18:59:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ncj674@motorola.com/11611004/45021

[commit-bot: I haz the power, 2013-01-04 21:06:23]

Change committed as 175192