diff options
| author | brg@chromium.com <brg@chromium.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 23:21:23 +0000 |
|---|---|---|
| committer | brg@chromium.com <brg@chromium.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 23:21:23 +0000 |
| commit | 6149d3e3ba96cc4aac419777094a1e090b0825e9 (patch) | |
| tree | 7a06e5ddae0d98d8c12b785d972ccc9d23c0beec | |
| parent | e15a4faf072c7627b2e4ce1801aaf7dafe035a5f (diff) | |
| download | chromium_src-6149d3e3ba96cc4aac419777094a1e090b0825e9.zip chromium_src-6149d3e3ba96cc4aac419777094a1e090b0825e9.tar.gz chromium_src-6149d3e3ba96cc4aac419777094a1e090b0825e9.tar.bz2 | |
Fix spelling error on history transition type.
Also mark the history test as flaky.
BUG=35430, 26296
TEST=ExtensionApiTest.FLAKY_History
Review URL: http://codereview.chromium.org/601049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38850 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_history_apitest.cc | 2 | ||||
| -rwxr-xr-x | chrome/common/extensions/api/extension_api.json | 2 | ||||
| -rw-r--r-- | chrome/renderer/resources/extension_process_bindings.js | 2 |
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, |