diff options
4 files changed, 14 insertions, 17 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module_constants.cc b/chrome/browser/extensions/extension_tabs_module_constants.cc index bde76c5..98f26f3 100644 --- a/chrome/browser/extensions/extension_tabs_module_constants.cc +++ b/chrome/browser/extensions/extension_tabs_module_constants.cc @@ -41,7 +41,7 @@ const char kWindowTypeKey[] = "type"; const char kFormatValueJpeg[] = "jpeg"; const char kFormatValuePng[] = "png"; -const char kMimeTypeJpeg[] = "image/jpg"; +const char kMimeTypeJpeg[] = "image/jpeg"; const char kMimeTypePng[] = "image/png"; const char kStatusValueComplete[] = "complete"; const char kStatusValueLoading[] = "loading"; diff --git a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/common/tabs_util.js b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/common/tabs_util.js index 5bfd177..917cd03 100644 --- a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/common/tabs_util.js +++ b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/common/tabs_util.js @@ -116,3 +116,8 @@ function countPixelsWithColors(imgUrl, windowRect, expectedColors, callback) { function pageUrl(base) { return chrome.extension.getURL('common/' + base + '.html'); } + +function assertIsStringWithPrefix(prefix, str) { + assertEq('string', typeof(str)); + assertEq(prefix, str.substr(0, prefix.length)); +} diff --git a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js index bf1bf55..3e07e3d 100644 --- a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js +++ b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js @@ -36,8 +36,7 @@ chrome.test.getConfig(function(config) { assertEq('complete', tab.status); // waitForAllTabs ensures this. chrome.tabs.captureVisibleTab(winId, pass(function(imgDataUrl) { // The URL should be a data URL with has a JPEG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/jpg;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/jpeg;base64,', imgDataUrl); whiteImageUrl = imgDataUrl; testPixelsAreExpectedColor(whiteImageUrl, @@ -59,8 +58,7 @@ chrome.test.getConfig(function(config) { assertEq('complete', tab.status); // waitForAllTabs ensures this. chrome.tabs.captureVisibleTab(winId, pass(function(imgDataUrl) { // The URL should be a data URL with has a JPEG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/jpg;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/jpeg;base64,', imgDataUrl); blackImageUrl = imgDataUrl; // Check that previous capture was done. @@ -98,8 +96,7 @@ chrome.test.getConfig(function(config) { assertEq('complete', tab.status); // waitForAllTabs ensures this. chrome.tabs.captureVisibleTab(winId, pass(function(imgDataUrl) { // The URL should be a data URL with has a JPEG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/jpg;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/jpeg;base64,', imgDataUrl); testPixelsAreExpectedColor(imgDataUrl, kWindowRect, '255,255,255,255'); // White. @@ -111,4 +108,3 @@ chrome.test.getConfig(function(config) { ]); }); - diff --git a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_png.js b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_png.js index 93b5942..5ab4e6a 100644 --- a/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_png.js +++ b/chrome/test/data/extensions/api_test/tabs/capture_visible_tab/test_png.js @@ -37,8 +37,7 @@ chrome.test.getConfig(function(config) { {'format': 'png'}, pass(function(imgDataUrl) { // The URL should be a data URL with has a PNG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/png;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/png;base64,', imgDataUrl); whiteImageUrl = imgDataUrl; testPixelsAreExpectedColor(whiteImageUrl, @@ -62,8 +61,8 @@ chrome.test.getConfig(function(config) { {'format': 'png'}, pass(function(imgDataUrl) { // The URL should be a data URL with has a PNG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/png;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/png;base64,', imgDataUrl); + textImageUrl = imgDataUrl; assertTrue(whiteImageUrl != textImageUrl); @@ -115,8 +114,7 @@ chrome.test.getConfig(function(config) { {'format': 'png'}, pass(function(imgDataUrl) { // The URL should be a data URL with has a PNG mime type. - assertEq('string', typeof(imgDataUrl)); - assertEq('data:image/png;base64,', imgDataUrl.substr(0,22)); + assertIsStringWithPrefix('data:image/png;base64,', imgDataUrl); testPixelsAreExpectedColor(imgDataUrl, kWindowRect, '255,255,255,255'); // White. @@ -124,9 +122,7 @@ chrome.test.getConfig(function(config) { })); })); })); - }, - + } ]); }); - |