Simplify Android geolocation permission checks

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/host_content_settings_map.h"
 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
@@ skipping 92 matching lines @@
     bubble_manager->AddRequest(request);
     return;
   }
 
   // TODO(gbillock): Delete this and the infobar delegate when
   // we're using only bubbles. crbug.com/337458
   GetQueueController()->CreateInfoBarRequest(
       id,
       requesting_origin,
       embedder_origin,
-      std::string(),
       base::Bind(&PermissionContextBase::PermissionDecided,
                  weak_factory_.GetWeakPtr(),
                  id,
                  requesting_origin,
                  embedder_origin,
                  callback,
                  // the queue controller takes care of persisting the
                  // permission
                  false));
 }
@@ skipping 55 matching lines @@
   DCHECK_EQ(embedder_origin, embedder_origin.GetOrigin());
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
       ContentSettingsPattern::FromURLNoWildcard(embedder_origin),
       permission_type_,
       std::string(),
       content_setting);
 }