3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_history_apitest.cc b/chrome/browser/extensions/extension_history_apitest.cc
index 94873b3..5dc3811 100644
--- a/chrome/browser/extensions/extension_history_apitest.cc
+++ b/chrome/browser/extensions/extension_history_apitest.cc
@@ -8,7 +8,7 @@
 #include "net/base/mock_host_resolver.h"
 
 // Flaky, http://crbug.com/26296.
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_History) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_History) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index c2be2c2..adb4872 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -1661,7 +1661,7 @@
           "visitId": {"type": "string", "description": "The unique identifier for this visit."},
           "visitTime": {"type": "number", "optional": true, "description": "When this visit occurred, represented in milliseconds since the epoch."},
           "referringVisitId": {"type": "string", "description": "The visit_id of the referrer."},
-          "transition": {"type": "integer", "minimum": 0, "maximum": 10, "description": "The transition type for this visit from its referrer.  The enumeration is defined in chrome.history.transistionType."}
+          "transition": {"type": "integer", "minimum": 0, "maximum": 10, "description": "The transition type for this visit from its referrer.  The enumeration is defined in chrome.history.transitionType."}
         }
       }
     ],
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index ae1881b..4b50d36 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -557,7 +557,7 @@ var chrome = chrome || {};
   if (!chrome.experimental.history)
     chrome.experimental.history = {};
 
-  chrome.experimental.history.transistionType = {
+  chrome.experimental.history.transitionType = {
     LINK: 0,
     TYPED: 1,
     AUTO_BOOKMARK: 2,