Pull latest googleurl to get various fixes

chrome/browser/extensions/extension_popup_api.cc

 // Copyright (c) 2009 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/extensions/extension_popup_api.h"
 
 #include "base/gfx/point.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "views/view.h"
 #endif
@@ skipping 105 matching lines @@
   GURL url = dispatcher()->url().Resolve(url_string);
   if (!url.is_valid()) {
     error_ = kInvalidURLError;
     return false;
   }
 
   // Disallow non-extension requests, or requests outside of the requesting
   // extension view's extension.
   const std::string& extension_id = url.host();
   if (extension_id != dispatcher()->GetExtension()->id() ||
-      !url.SchemeIs("chrome-extension")) {
+      !url.SchemeIs(chrome::kExtensionScheme)) {
     error_ = kInvalidURLError;
     return false;
   }
 
 #if defined(TOOLKIT_VIEWS)
   gfx::Point origin(dom_left, dom_top);
   if (!ConvertHostPointToScreen(&origin)) {
     error_ = kNotAnExtension;
     return false;
   }
@@ skipping 83 matching lines @@
                                      int routing_id) {
   std::string full_event_name = StringPrintf(
       extension_popup_module_events::kOnPopupClosed,
       routing_id);
 
   profile->GetExtensionMessageService()->DispatchEventToRenderers(
       full_event_name,
       base::JSONWriter::kEmptyArray,
       profile->IsOffTheRecord());
 }