diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:15:40 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:15:40 +0000 |
| commit | 8a2c0ed88a756f3353337f8aa8ac3d6a63efeabf (patch) | |
| tree | 984404df75ec8115b7d8d0f755f876b5cbc9a7b9 /chrome/browser/extensions/extension_function_test_utils.cc | |
| parent | 788b03210fc26a7ef3b0ad37b6022626715f01f0 (diff) | |
| download | chromium_src-8a2c0ed88a756f3353337f8aa8ac3d6a63efeabf.zip chromium_src-8a2c0ed88a756f3353337f8aa8ac3d6a63efeabf.tar.gz chromium_src-8a2c0ed88a756f3353337f8aa8ac3d6a63efeabf.tar.bz2 | |
Reverting due to compile failure on multiple bots.
Revert 114615 - chrome.clear: Increasing granularity of public API
http://codereview.chromium.org/7717023 added more granular options to
BrowsingDataRemover. This CL exposes those options to the chrome.clear
extension API. Among other things, this means that chrome.clear.cookies()
will _only_ clear cookies, not cookies and site data.
At the moment, clearing any quota managed data type will clear them all.
That is being addressed in http://codereview.chromium.org/7839029/
but is independent from changing the public interface.
BUG=94334
TEST=browser_tests
Review URL: http://codereview.chromium.org/8008012
TBR=mkwst@chromium.org
Review URL: http://codereview.chromium.org/8949014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function_test_utils.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_function_test_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index 442013d..9953807 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -138,8 +138,8 @@ base::Value* RunFunctionAndReturnResult(UIThreadExtensionFunction* function, RunFunction(function, args, browser, flags); EXPECT_TRUE(function->GetError().empty()) << "Unexpected error: " << function->GetError(); - return (function->GetResultValue() == NULL) ? NULL : - function->GetResultValue()->DeepCopy(); + EXPECT_TRUE(function->GetResultValue()) << "No result value found"; + return function->GetResultValue()->DeepCopy(); } // This helps us be able to wait until an AsyncExtensionFunction calls |