summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 23:47:28 +0000
committermeacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-13 23:47:28 +0000
commit016440eed73eed0be9e3d29de83196ae9eeb1527 (patch)
tree966179e0776301b150897fdf6f75d6f9517018e5
parent5cdd378c4349b1f1bec213c3f97d012fb845ec18 (diff)
downloadchromium_src-016440eed73eed0be9e3d29de83196ae9eeb1527.zip
chromium_src-016440eed73eed0be9e3d29de83196ae9eeb1527.tar.gz
chromium_src-016440eed73eed0be9e3d29de83196ae9eeb1527.tar.bz2
Merge 242254 "Convert the DCHECK to CHECK for bad NOTIFICATION_E..."
> Convert the DCHECK to CHECK for bad NOTIFICATION_EXTENSION_VIEW_REGISTERED message. > > BUG=294687 > TBR=yoshiki@chromium.org > > Review URL: https://codereview.chromium.org/109653017 TBR=yoz@chromium.org Review URL: https://codereview.chromium.org/137543003 git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@244610 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/task_manager/extension_process_resource_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc
index e6d9a97..11ebdf0 100644
--- a/chrome/browser/task_manager/extension_process_resource_provider.cc
+++ b/chrome/browser/task_manager/extension_process_resource_provider.cc
@@ -315,7 +315,7 @@ void ExtensionProcessResourceProvider::AddToTaskManager(
ExtensionProcessResource* resource =
new ExtensionProcessResource(render_view_host);
- DCHECK(resources_.find(render_view_host) == resources_.end());
+ CHECK(resources_.find(render_view_host) == resources_.end());
resources_[render_view_host] = resource;
task_manager_->AddResource(resource);
}