Port BrowsingDataDatabaseHelper to webkit_database::DatabaseIdentifier

chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc

 // 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
@@ skipping 53 matching lines @@
       BrowsingDataDatabaseHelper* database_helper)
       : database_helper_(database_helper) {
     DCHECK(database_helper_);
   }
 
   void Callback(const std::list<BrowsingDataDatabaseHelper::DatabaseInfo>&
                 database_info_list) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     ASSERT_EQ(1UL, database_info_list.size());
     EXPECT_EQ(std::string(kTestIdentifier1),
-              database_info_list.begin()->origin_identifier);
+              database_info_list.begin()->identifier.ToString());
     base::MessageLoop::current()->Quit();
   }
 
  private:
   BrowsingDataDatabaseHelper* database_helper_;
 };
 
 // Flaky on Win/Mac/Linux: http://crbug.com/92460
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
   CreateDatabases();
@@ skipping 25 matching lines @@
   helper->StartFetching(
       base::Bind(&TestCompletionCallback::callback,
                  base::Unretained(&callback)));
 
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(3u, result.size());
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo>::iterator info =
       result.begin();
-  EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
+  EXPECT_EQ(origin_str1, info->identifier.ToString());
   EXPECT_STREQ(db1, info->database_name.c_str());
   info++;
-  EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
+  EXPECT_EQ(origin_str1, info->identifier.ToString());
   EXPECT_STREQ(db2, info->database_name.c_str());
   info++;
-  EXPECT_STREQ(origin_str2, info->origin_identifier.c_str());
+  EXPECT_EQ(origin_str2, info->identifier.ToString());
   EXPECT_STREQ(db3, info->database_name.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedUnique) {
   const GURL origin("http://host1:1/");
   const char origin_str[] = "http_host1_1";
   const char db[] = "db1";
 
   scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
       new CannedBrowsingDataDatabaseHelper(browser()->profile()));
   helper->AddDatabase(origin, db, std::string());
   helper->AddDatabase(origin, db, std::string());
 
   TestCompletionCallback callback;
   helper->StartFetching(
       base::Bind(&TestCompletionCallback::callback,
                  base::Unretained(&callback)));
 
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
-  EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str());
+  EXPECT_EQ(origin_str, result.begin()->identifier.ToString());
   EXPECT_STREQ(db, result.begin()->database_name.c_str());
 }
 }  // namespace