Avoid showing the user a garbage path attribute when the cookie doesn't have ...

chrome/browser/views/cookie_info_view.cc

 // Copyright (c) 2010 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/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 70 matching lines @@
     expires_value_field_->SetText(expire_text);
   }
 
   send_for_value_field_->SetText(cookie.IsSecure() ?
       l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
       l10n_util::GetString(IDS_COOKIES_COOKIE_SENDFOR_ANY));
   EnableCookieDisplay(true);
   Layout();
 }
 
-void CookieInfoView::SetCookieString(
-    const std::string& host,
-    const std::string& cookie_line) {
+void CookieInfoView::SetCookieString(const GURL& url,
+                                     const std::string& cookie_line) {
   net::CookieMonster::ParsedCookie pc(cookie_line);
-  net::CookieMonster::CanonicalCookie cookie(
-      pc.Name(),
-      pc.Value(),
-      pc.Path(),
-      pc.IsSecure(),
-      pc.IsHttpOnly(),
-      base::Time::Now(),  // creation time
-      base::Time(),       // last access time is unused
-      pc.HasExpires(),
-      pc.HasExpires() ?
-          net::CookieMonster::ParseCookieTime(pc.Expires()) :
-          base::Time());
-  SetCookie(pc.HasDomain() ? pc.Domain() : host, cookie);
+  net::CookieMonster::CanonicalCookie cookie(url, pc);
+  SetCookie(pc.HasDomain() ? pc.Domain() : url.host(), cookie);
 }
 
 
 void CookieInfoView::ClearCookieDisplay() {
   std::wstring no_cookie_string =
       l10n_util::GetString(IDS_COOKIES_COOKIE_NONESELECTED);
   name_value_field_->SetText(no_cookie_string);
   content_value_field_->SetText(no_cookie_string);
   domain_value_field_->SetText(no_cookie_string);
   path_value_field_->SetText(no_cookie_string);
@@ skipping 160 matching lines @@
   created_value_field_->SetReadOnly(true);
   created_value_field_->RemoveBorder();
   created_value_field_->SetBackgroundColor(text_area_background);
   if (expires_value_field_) {
     expires_value_field_->SetReadOnly(true);
     expires_value_field_->RemoveBorder();
     expires_value_field_->SetBackgroundColor(text_area_background);
   }
 }