Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browsing_data / browsing_data_database_helper_browsertest.cc

diff --git a/src/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc b/src/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index bbec15d..ee27fb7 100644 (file)
--- a/src/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
+++ b/src/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/file_util.h"
+#include "base/files/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"
@@ -30,9 +30,9 @@ const char kTestIdentifierExtension[] =
 class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
  public:
   virtual void CreateDatabases() {
-    webkit_database::DatabaseTracker* db_tracker =
-        BrowserContext::GetDefaultStoragePartition(browser()->profile())->
-            GetDatabaseTracker();
+    storage::DatabaseTracker* db_tracker =
+        BrowserContext::GetDefaultStoragePartition(browser()->profile())
+            ->GetDatabaseTracker();
     base::string16 db_name = base::ASCIIToUTF16("db");
     base::string16 description = base::ASCIIToUTF16("db_description");
     int64 size;
@@ -50,7 +50,7 @@ class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
         db_tracker->GetFullDBFilePath(kTestIdentifierExtension, db_name);
     base::CreateDirectory(db_path2.DirName());
     ASSERT_EQ(0, base::WriteFile(db_path2, NULL, 0));
-    std::vector<webkit_database::OriginInfo> origins;
+    std::vector<storage::OriginInfo> origins;
     db_tracker->GetAllOriginsInfo(&origins);
     ASSERT_EQ(2U, origins.size());
   }