Move input.ime back out of experimental for M21

BUG=chromium-os:23646


Review URL: https://chromiumcodereview.appspot.com/10533170

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142664 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 64 insertions, 62 deletions

diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc
index 0ef52e7..97cf42d 100644
--- a/chrome/browser/extensions/extension_input_ime_api.cc
+++ b/chrome/browser/extensions/extension_input_ime_api.cc
@@ -128,16 +128,14 @@ bool ReadMenuItems(
 
 namespace events {
 
-const char kOnActivate[] = "experimental.input.ime.onActivate";
-const char kOnDeactivated[] = "experimental.input.ime.onDeactivated";
-const char kOnFocus[] = "experimental.input.ime.onFocus";
-const char kOnBlur[] = "experimental.input.ime.onBlur";
-const char kOnInputContextUpdate[] =
-    "experimental.input.ime.onInputContextUpdate";
-const char kOnKeyEvent[] = "experimental.input.ime.onKeyEvent";
-const char kOnCandidateClicked[] = "experimental.input.ime.onCandidateClicked";
-const char kOnMenuItemActivated[] =
-    "experimental.input.ime.onMenuItemActivated";
+const char kOnActivate[] = "input.ime.onActivate";
+const char kOnDeactivated[] = "input.ime.onDeactivated";
+const char kOnFocus[] = "input.ime.onFocus";
+const char kOnBlur[] = "input.ime.onBlur";
+const char kOnInputContextUpdate[] = "input.ime.onInputContextUpdate";
+const char kOnKeyEvent[] = "input.ime.onKeyEvent";
+const char kOnCandidateClicked[] = "input.ime.onCandidateClicked";
+const char kOnMenuItemActivated[] = "input.ime.onMenuItemActivated";
 
 }  // namespace events
 
diff --git a/chrome/browser/extensions/extension_input_ime_api.h b/chrome/browser/extensions/extension_input_ime_api.h
index 1220871..799ac98 100644
--- a/chrome/browser/extensions/extension_input_ime_api.h
+++ b/chrome/browser/extensions/extension_input_ime_api.h
@@ -67,7 +67,7 @@ class ExtensionInputImeEventRouter {
 
 class SetCompositionFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.setComposition");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setComposition");
 
  protected:
   virtual ~SetCompositionFunction() {}
@@ -78,7 +78,7 @@ class SetCompositionFunction : public SyncExtensionFunction {
 
 class ClearCompositionFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.clearComposition");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.clearComposition");
 
  protected:
   virtual ~ClearCompositionFunction() {}
@@ -89,7 +89,7 @@ class ClearCompositionFunction : public SyncExtensionFunction {
 
 class CommitTextFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.commitText");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.commitText");
 
  protected:
   virtual ~CommitTextFunction() {}
@@ -100,8 +100,7 @@ class CommitTextFunction : public SyncExtensionFunction {
 
 class SetCandidateWindowPropertiesFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME(
-      "experimental.input.ime.setCandidateWindowProperties");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCandidateWindowProperties");
 
  protected:
   virtual ~SetCandidateWindowPropertiesFunction() {}
@@ -112,7 +111,7 @@ class SetCandidateWindowPropertiesFunction : public SyncExtensionFunction {
 
 class SetCandidatesFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.setCandidates");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCandidates");
 
  protected:
   virtual ~SetCandidatesFunction() {}
@@ -128,7 +127,7 @@ class SetCandidatesFunction : public SyncExtensionFunction {
 
 class SetCursorPositionFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.setCursorPosition");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCursorPosition");
 
  protected:
   virtual ~SetCursorPositionFunction() {}
@@ -139,7 +138,7 @@ class SetCursorPositionFunction : public SyncExtensionFunction {
 
 class SetMenuItemsFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.setMenuItems");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setMenuItems");
 
  protected:
   virtual ~SetMenuItemsFunction() {}
@@ -150,7 +149,7 @@ class SetMenuItemsFunction : public SyncExtensionFunction {
 
 class UpdateMenuItemsFunction : public SyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.updateMenuItems");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.updateMenuItems");
 
  protected:
   virtual ~UpdateMenuItemsFunction() {}
@@ -161,7 +160,7 @@ class UpdateMenuItemsFunction : public SyncExtensionFunction {
 
 class InputEventHandled : public AsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.eventHandled");
+  DECLARE_EXTENSION_FUNCTION_NAME("input.ime.eventHandled");
 
  protected:
   virtual ~InputEventHandled() {}
diff --git a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
index 667f0cc..cd0ced6 100644
--- a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
+++ b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
@@ -9,9 +9,6 @@
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, InputImeApiBasic) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-  switches::kEnableExperimentalExtensionApis);
-
   ASSERT_TRUE(RunExtensionTest("input_ime")) << message_;
 }
 #endif
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 32e5bb3..883dd06 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -398,7 +398,7 @@ void ExtensionAPI::InitDefaultConfiguration() {
       IDR_EXTENSION_API_JSON_I18N));
   RegisterSchema("idle", ReadFromResource(
       IDR_EXTENSION_API_JSON_IDLE));
-  RegisterSchema("experimental.input.ime", ReadFromResource(
+  RegisterSchema("input.ime", ReadFromResource(
       IDR_EXTENSION_API_JSON_INPUT_IME));
   RegisterSchema("inputMethodPrivate", ReadFromResource(
       IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE));
diff --git a/chrome/common/extensions/api/input_ime.json b/chrome/common/extensions/api/input_ime.json
index 9b96ca9..9ddcea8 100644
--- a/chrome/common/extensions/api/input_ime.json
+++ b/chrome/common/extensions/api/input_ime.json
@@ -4,7 +4,7 @@
 
 [
   {
-    "namespace": "experimental.input.ime",
+    "namespace": "input.ime",
     "platforms": ["chromeos"],
     "types": [
       {
diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html
index e1e3172..f8dcb73 100644
--- a/chrome/common/extensions/docs/api_index.html
+++ b/chrome/common/extensions/docs/api_index.html
@@ -221,7 +221,7 @@ so that extensions can interact with the browser.
 Here are the supported chrome.* APIs:
 </p>
 <ul>
-  <li><a href="alarms.html" js="">alarms</a></li><li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="browsingData.html" js="">browsingData</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="declarativeWebRequest.html" js="">declarativeWebRequest</a></li><li><a href="events.html" js="">events</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="runtime.html" js="">runtime</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="topSites.html" js="">topSites</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="webstore.html" js="">webstore</a></li><li><a href="windows.html" js="">windows</a></li>
+  <li><a href="alarms.html" js="">alarms</a></li><li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="browsingData.html" js="">browsingData</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="declarativeWebRequest.html" js="">declarativeWebRequest</a></li><li><a href="events.html" js="">events</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="input.ime.html" js="">input.ime</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="runtime.html" js="">runtime</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="topSites.html" js="">topSites</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="webstore.html" js="">webstore</a></li><li><a href="windows.html" js="">windows</a></li>
 </ul>
 <h2 id="experimental">Experimental APIs</h2>
 <p>
diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html
index c568a13..5ce8b69 100644
--- a/chrome/common/extensions/docs/experimental.html
+++ b/chrome/common/extensions/docs/experimental.html
@@ -245,7 +245,6 @@ on the following experimental APIs:
   <a href="experimental.fontSettings.html">experimental.fontSettings</a></li><li>
   <a href="experimental.identity.html">experimental.identity</a></li><li>
   <a href="experimental.infobars.html">experimental.infobars</a></li><li>
-  <a href="experimental.input.ime.html">experimental.input.ime</a></li><li>
   <a href="experimental.keybinding.html">experimental.keybinding</a></li><li>
   <a href="experimental.mediaGalleries.html">experimental.mediaGalleries</a></li><li>
   <a href="experimental.offscreenTabs.html">experimental.offscreenTabs</a></li><li>
diff --git a/chrome/common/extensions/docs/experimental.offscreenTabs.html b/chrome/common/extensions/docs/experimental.offscreenTabs.html
index 8aa4f25..93f76a3 100644
--- a/chrome/common/extensions/docs/experimental.offscreenTabs.html
+++ b/chrome/common/extensions/docs/experimental.offscreenTabs.html
@@ -776,7 +776,7 @@
                   (
                     <span id="typeTemplate">
                       <span>
-                        <a href="experimental.input.ime.html#type-KeyboardEvent">KeyboardEvent</a>
+                        <a href="input.ime.html#type-KeyboardEvent">KeyboardEvent</a>
                       </span>
                     </span>
                   )
diff --git a/chrome/common/extensions/docs/input.ime.html b/chrome/common/extensions/docs/input.ime.html
index f9cdd9b..82e572d 100644
--- a/chrome/common/extensions/docs/input.ime.html
+++ b/chrome/common/extensions/docs/input.ime.html
@@ -2298,6 +2298,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onBlur"></a>
               <h4>onBlur</h4>
@@ -2342,6 +2343,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onCandidateClicked"></a>
               <h4>onCandidateClicked</h4>
@@ -2434,6 +2436,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onDeactivated"></a>
               <h4>onDeactivated</h4>
@@ -2478,6 +2481,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onFocus"></a>
               <h4>onFocus</h4>
@@ -2522,6 +2526,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onInputContextUpdate"></a>
               <h4>onInputContextUpdate</h4>
@@ -2566,6 +2571,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onKeyEvent"></a>
               <h4>onKeyEvent</h4>
@@ -2657,6 +2663,7 @@
                   </div>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div><div class="apiItem">
               <a name="event-onMenuItemActivated"></a>
               <h4>onMenuItemActivated</h4>
@@ -2724,6 +2731,7 @@
                 <dl>
                 </dl>
               </div> <!-- /description -->
+               <!-- /description -->
             </div> <!-- /apiItem -->
           </div> <!-- /apiGroup -->
           <!-- TYPES -->
diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html
index 398cbe3..0f8cf33 100644
--- a/chrome/common/extensions/docs/samples.html
+++ b/chrome/common/extensions/docs/samples.html
@@ -310,6 +310,8 @@
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.idle', this)">chrome.idle</a><span>, </span>
       </span><span>
+        <a href="javascript:void(0);" onclick="setFilter('chrome.input.ime', this)">chrome.input.ime</a><span>, </span>
+      </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.management', this)">chrome.management</a><span>, </span>
       </span><span>
         <a href="javascript:void(0);" onclick="setFilter('chrome.omnibox', this)">chrome.omnibox</a><span>, </span>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index dd2e9d1..6c8b9f46 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -158,22 +158,6 @@
     "chrome.experimental.idltest.sendArrayBuffer": "experimental.idltest.html#method-sendArrayBuffer",
     "chrome.experimental.idltest.sendArrayBufferView": "experimental.idltest.html#method-sendArrayBufferView",
     "chrome.experimental.infobars.show": "experimental.infobars.html#method-show",
-    "chrome.experimental.input.ime.clearComposition": "experimental.input.ime.html#method-clearComposition",
-    "chrome.experimental.input.ime.commitText": "experimental.input.ime.html#method-commitText",
-    "chrome.experimental.input.ime.onActivate": "experimental.input.ime.html#event-onActivate",
-    "chrome.experimental.input.ime.onBlur": "experimental.input.ime.html#event-onBlur",
-    "chrome.experimental.input.ime.onCandidateClicked": "experimental.input.ime.html#event-onCandidateClicked",
-    "chrome.experimental.input.ime.onDeactivated": "experimental.input.ime.html#event-onDeactivated",
-    "chrome.experimental.input.ime.onFocus": "experimental.input.ime.html#event-onFocus",
-    "chrome.experimental.input.ime.onInputContextUpdate": "experimental.input.ime.html#event-onInputContextUpdate",
-    "chrome.experimental.input.ime.onKeyEvent": "experimental.input.ime.html#event-onKeyEvent",
-    "chrome.experimental.input.ime.onMenuItemActivated": "experimental.input.ime.html#event-onMenuItemActivated",
-    "chrome.experimental.input.ime.setCandidateWindowProperties": "experimental.input.ime.html#method-setCandidateWindowProperties",
-    "chrome.experimental.input.ime.setCandidates": "experimental.input.ime.html#method-setCandidates",
-    "chrome.experimental.input.ime.setComposition": "experimental.input.ime.html#method-setComposition",
-    "chrome.experimental.input.ime.setCursorPosition": "experimental.input.ime.html#method-setCursorPosition",
-    "chrome.experimental.input.ime.setMenuItems": "experimental.input.ime.html#method-setMenuItems",
-    "chrome.experimental.input.ime.updateMenuItems": "experimental.input.ime.html#method-updateMenuItems",
     "chrome.experimental.keybinding.onCommand": "experimental.keybinding.html#event-onCommand",
     "chrome.experimental.mediaGalleries.assembleMediaFile": "experimental.mediaGalleries.html#method-assembleMediaFile",
     "chrome.experimental.mediaGalleries.extractEmbeddedThumbnails": "experimental.mediaGalleries.html#method-extractEmbeddedThumbnails",
@@ -243,6 +227,7 @@
     "chrome.extension.setUpdateUrlData": "extension.html#method-setUpdateUrlData",
     "chrome.fileBrowserHandler.onExecute": "fileBrowserHandler.html#event-onExecute",
     "chrome.fileBrowserHandler.selectFile": "fileBrowserHandler.html#method-selectFile",
+    "chrome.fileSystem.chooseFile": "fileSystem.html#method-chooseFile",
     "chrome.fileSystem.getDisplayPath": "fileSystem.html#method-getDisplayPath",
     "chrome.fileSystem.getWritableFileEntry": "fileSystem.html#method-getWritableFileEntry",
     "chrome.history.addUrl": "history.html#method-addUrl",
@@ -257,6 +242,22 @@
     "chrome.i18n.getMessage": "i18n.html#method-getMessage",
     "chrome.idle.onStateChanged": "idle.html#event-onStateChanged",
     "chrome.idle.queryState": "idle.html#method-queryState",
+    "chrome.input.ime.clearComposition": "input.ime.html#method-clearComposition",
+    "chrome.input.ime.commitText": "input.ime.html#method-commitText",
+    "chrome.input.ime.onActivate": "input.ime.html#event-onActivate",
+    "chrome.input.ime.onBlur": "input.ime.html#event-onBlur",
+    "chrome.input.ime.onCandidateClicked": "input.ime.html#event-onCandidateClicked",
+    "chrome.input.ime.onDeactivated": "input.ime.html#event-onDeactivated",
+    "chrome.input.ime.onFocus": "input.ime.html#event-onFocus",
+    "chrome.input.ime.onInputContextUpdate": "input.ime.html#event-onInputContextUpdate",
+    "chrome.input.ime.onKeyEvent": "input.ime.html#event-onKeyEvent",
+    "chrome.input.ime.onMenuItemActivated": "input.ime.html#event-onMenuItemActivated",
+    "chrome.input.ime.setCandidateWindowProperties": "input.ime.html#method-setCandidateWindowProperties",
+    "chrome.input.ime.setCandidates": "input.ime.html#method-setCandidates",
+    "chrome.input.ime.setComposition": "input.ime.html#method-setComposition",
+    "chrome.input.ime.setCursorPosition": "input.ime.html#method-setCursorPosition",
+    "chrome.input.ime.setMenuItems": "input.ime.html#method-setMenuItems",
+    "chrome.input.ime.updateMenuItems": "input.ime.html#method-updateMenuItems",
     "chrome.management.get": "management.html#method-get",
     "chrome.management.getAll": "management.html#method-getAll",
     "chrome.management.getPermissionWarningsById": "management.html#method-getPermissionWarningsById",
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index add0813..221f202 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -582,8 +582,7 @@ void ExtensionDispatcher::PopulateSourceMap() {
   source_map_.RegisterSource("fileSystem",
                              IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);
-  source_map_.RegisterSource("experimental.input.ime",
-                             IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
+  source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("pageActions",
                              IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);
diff --git a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
index bf48ea7..8f400c7 100644
--- a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
@@ -7,30 +7,29 @@
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 
-chromeHidden.registerCustomHook('experimental.input.ime', function() {
-  chrome.experimental.input.ime.onKeyEvent.dispatch =
-    function(engineID, keyData) {
+chromeHidden.registerCustomHook('input.ime', function() {
+  chrome.input.ime.onKeyEvent.dispatch = function(engineID, keyData) {
     var args = Array.prototype.slice.call(arguments);
     if (this.validate_) {
       var validationErrors = this.validate_(args);
       if (validationErrors) {
-        chrome.experimental.input.ime.eventHandled(requestId, false);
+        chrome.input.ime.eventHandled(requestId, false);
         return validationErrors;
       }
     }
     if (this.listeners_.length > 1) {
       console.error('Too many listeners for onKeyEvent: ' + e.stack);
-      chrome.experimental.input.ime.eventHandled(requestId, false);
+      chrome.input.ime.eventHandled(requestId, false);
       return;
     }
     for (var i = 0; i < this.listeners_.length; i++) {
       try {
         var requestId = keyData.requestId;
         var result = this.listeners_[i].apply(null, args);
-        chrome.experimental.input.ime.eventHandled(requestId, result);
+        chrome.input.ime.eventHandled(requestId, result);
       } catch (e) {
         console.error('Error in event handler for onKeyEvent: ' + e.stack);
-        chrome.experimental.input.ime.eventHandled(requestId, false);
+        chrome.input.ime.eventHandled(requestId, false);
       }
     }
   };
diff --git a/chrome/test/data/extensions/api_test/input_ime/background.js b/chrome/test/data/extensions/api_test/input_ime/background.js
index 0fbe81b..826d290 100644
--- a/chrome/test/data/extensions/api_test/input_ime/background.js
+++ b/chrome/test/data/extensions/api_test/input_ime/background.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 function setCompositionTest() {
-  chrome.experimental.input.ime.setComposition({
+  chrome.input.ime.setComposition({
     "contextID": 1,
     "text": "Pie",
     "selectionStart": 1,
@@ -19,14 +19,14 @@ function setCompositionTest() {
 
 
 function clearCompositionTest() {
-  chrome.experimental.input.ime.clearComposition({
+  chrome.input.ime.clearComposition({
     "contextID": 1
   }, chrome.test.callbackPass());
 }
 
 
 function commitTextTest() {
-  chrome.experimental.input.ime.commitText({
+  chrome.input.ime.commitText({
     "contextID": 2,
     "text": "Seaguls"
   }, chrome.test.callbackPass());
@@ -34,7 +34,7 @@ function commitTextTest() {
 
 
 function setCandidateWindowPropertiesTest() {
-  chrome.experimental.input.ime.setCandidateWindowProperties({
+  chrome.input.ime.setCandidateWindowProperties({
     "engineID": "test",
     "properties": {
       "visible": true,
@@ -49,7 +49,7 @@ function setCandidateWindowPropertiesTest() {
 
 
 function setCandidatesTest() {
-  chrome.experimental.input.ime.setCandidates({
+  chrome.input.ime.setCandidates({
     "contextID": 8,
     "candidates": [{
       "candidate": "one",
@@ -72,7 +72,7 @@ function setCandidatesTest() {
 
 
 function setCursorPositionTest() {
-  chrome.experimental.input.ime.setCursorPosition({
+  chrome.input.ime.setCursorPosition({
     "contextID": 9,
     "candidateID": 1
   }, chrome.test.callbackPass());
@@ -81,7 +81,7 @@ function setCursorPositionTest() {
 
 
 function setMenuItemsTest() {
-  chrome.experimental.input.ime.setMenuItems({
+  chrome.input.ime.setMenuItems({
     "engineID": "test",
     "items": [{
       "id": "Menu 1",
@@ -100,7 +100,7 @@ function setMenuItemsTest() {
 }
 
 function updateMenuItemsTest() {
-  chrome.experimental.input.ime.updateMenuItems({
+  chrome.input.ime.updateMenuItems({
     "engineID": "test",
     "items": [{
       "id": "Menu 1",
diff --git a/chrome/test/data/extensions/api_test/input_ime/manifest.json b/chrome/test/data/extensions/api_test/input_ime/manifest.json
index 4cb2893..1382a2b 100644
--- a/chrome/test/data/extensions/api_test/input_ime/manifest.json
+++ b/chrome/test/data/extensions/api_test/input_ime/manifest.json
@@ -7,7 +7,7 @@
   "background": {
     "scripts": ["background.js"]
   },
-  "permissions": [ "input", "experimental" ],
+  "permissions": [ "input" ],
   "input_components": [{
     "name": "Test IME",
     "type": "ime",