diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 21:57:40 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-24 21:57:40 +0000 |
| commit | 3c1759548dece0cc6cac2e359920d55c801163ce (patch) | |
| tree | 410c0fca8aaa2b740e00247715cf4d49ca8ccc7f | |
| parent | cc7508e05577ef53e15d51ea1507820124218ad7 (diff) | |
| download | chromium_src-3c1759548dece0cc6cac2e359920d55c801163ce.zip chromium_src-3c1759548dece0cc6cac2e359920d55c801163ce.tar.gz chromium_src-3c1759548dece0cc6cac2e359920d55c801163ce.tar.bz2 | |
Revert 279293 "Extensions: Add some CHECKs to help track down a ..."
> Extensions: Add some CHECKs to help track down a flaky TestAdblockExtensionCrash.
>
> BUG=387866
>
> Review URL: https://codereview.chromium.org/354493003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/352693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279506 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/chrome_extensions_browser_client.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_functional_browsertest.cc | 6 | ||||
| -rw-r--r-- | extensions/browser/content_verifier.cc | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc index b652462..dc7cfaf 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -93,8 +93,6 @@ content::BrowserContext* ChromeExtensionsBrowserClient::GetOffTheRecordContext( content::BrowserContext* ChromeExtensionsBrowserClient::GetOriginalContext( content::BrowserContext* context) { - // TODO(thestig): Remove after investigating http://crbug.com/387866 - CHECK(context); return static_cast<Profile*>(context)->GetOriginalProfile(); } diff --git a/chrome/browser/extensions/extension_functional_browsertest.cc b/chrome/browser/extensions/extension_functional_browsertest.cc index e665f56..20e835f 100644 --- a/chrome/browser/extensions/extension_functional_browsertest.cc +++ b/chrome/browser/extensions/extension_functional_browsertest.cc @@ -59,11 +59,7 @@ class ExtensionFunctionalTest : public ExtensionBrowserTest { IN_PROC_BROWSER_TEST_F(ExtensionFunctionalTest, PRE_TestAdblockExtensionCrash) { - // TODO(thestig): Remove CHECK and fold this back into - // InstallExtensionSilently() after fixing http://crbug.com/387866. - ExtensionService* service = GetExtensionService(); - CHECK(service); - InstallExtensionSilently(service, "adblock.crx"); + InstallExtensionSilently(GetExtensionService(), "adblock.crx"); } // Timing out on XP and Vista: http://crbug.com/387866 diff --git a/extensions/browser/content_verifier.cc b/extensions/browser/content_verifier.cc index 1e1cf6a..97e2de2 100644 --- a/extensions/browser/content_verifier.cc +++ b/extensions/browser/content_verifier.cc @@ -26,8 +26,6 @@ ContentVerifier::ContentVerifier(content::BrowserContext* context, context, delegate, base::Bind(&ContentVerifier::OnFetchComplete, this))) { - // TODO(thestig): Remove after investigating http://crbug.com/387866 - CHECK(context); } ContentVerifier::~ContentVerifier() { |