Port BrowsingDataDatabaseHelper to webkit_database::DatabaseIdentifier

chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm

 // Copyright (c) 2012 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 "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 #include "googleurl/src/gurl.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
@@ skipping 36 matching lines @@
   EXPECT_FALSE([details.get() shouldShowDatabaseTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowAppCacheTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowIndexedDBTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStoragePromptDetailsView]);
   EXPECT_FALSE([details.get() shouldShowDatabasePromptDetailsView]);
   EXPECT_FALSE([details.get() shouldShowAppCachePromptDetailsView]);
 }
 
 TEST_F(CookiesDetailsTest, CreateForTreeDatabase) {
   scoped_nsobject<CocoaCookieDetails> details;
-  std::string host("http://chromium.org");
+  GURL origin("http://chromium.org");
   std::string database_name("sassolungo");
-  std::string origin_identifier("dolomites");
   std::string description("a great place to climb");
   int64 size = 1234;
   base::Time last_modified = base::Time::Now();
-  BrowsingDataDatabaseHelper::DatabaseInfo info(host, database_name,
-      origin_identifier, description, host, size, last_modified);
+  BrowsingDataDatabaseHelper::DatabaseInfo info(
+      webkit_database::DatabaseIdentifier::CreateFromOrigin(origin),
+      database_name, description, size, last_modified);
   details.reset([[CocoaCookieDetails alloc] initWithDatabase:&info]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeTreeDatabase);
   EXPECT_NSEQ(@"a great place to climb", [details.get() databaseDescription]);
   EXPECT_NSEQ(@"1,234 B", [details.get() fileSize]);
   EXPECT_NSNE(@"", [details.get() lastModified]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
   EXPECT_TRUE([details.get() shouldShowDatabaseTreeDetailsView]);
@@ skipping 150 matching lines @@
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowDatabaseTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowAppCacheTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowIndexedDBTreeDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStoragePromptDetailsView]);
   EXPECT_FALSE([details.get() shouldShowDatabasePromptDetailsView]);
   EXPECT_TRUE([details.get() shouldShowAppCachePromptDetailsView]);
 }
 
 }