Dismiss permission bubble request if it's a duplicate

chrome/browser/content_settings/permission_context_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/permission_context_base.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
@@ skipping 99 matching lines @@
       NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                           false /* persist */, true /* granted */);
       return;
     default:
       break;
   }
 
   PermissionContextUmaUtil::PermissionRequested(
       permission_type_, requesting_origin);
 
+  // The request should only be null if the request_ptr has destructed, which
+  // should not normally happen before this invoked.
+  // TODO(felt): crbug.com/433877, where a bug causes this to occur.
+  DCHECK(pending_bubbles_.get(id.ToString()) != NULL);

[groby-ooo-7-16, 2015/01/28 22:47:00]

Please don't do that - style guide explicitly calls for either DCHECK or error
handling. 

[felt, 2015/01/29 06:06:06]

Done. Picked error handling.

+  if (pending_bubbles_.get(id.ToString()) != NULL)
+    return;
+
   if (PermissionBubbleManager::Enabled()) {
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     DCHECK(bubble_manager);
     scoped_ptr<PermissionBubbleRequest> request_ptr(
         new PermissionBubbleRequestImpl(
             requesting_origin, user_gesture, permission_type_,
             profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
             base::Bind(&PermissionContextBase::PermissionDecided,
                        weak_factory_.GetWeakPtr(), id, requesting_origin,
@@ skipping 81 matching lines @@
                                                  bool allowed) {
   DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
   DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
       permission_type_, std::string(), content_setting);
 }