From 8a2c0ed88a756f3353337f8aa8ac3d6a63efeabf Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Thu, 15 Dec 2011 10:15:40 +0000 Subject: 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 --- chrome/browser/extensions/extension_function_test_utils.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/extensions/extension_function_test_utils.cc') 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 -- cgit v1.1