Revert 209071 "components/webdata: Break the dependency on chrom..."

trunk/src/components/webdata/common/web_database_migration_unittest.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 <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/webdata/autofill_change.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/webdata/common/web_database.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 167 matching lines @@
   // number and a new migration test added below.
   static const int kCurrentTestedVersionNumber;
 
   base::FilePath GetDatabasePath() {
     const base::FilePath::CharType kWebDatabaseFilename[] =
         FILE_PATH_LITERAL("TestWebDatabase.sqlite3");
     return temp_dir_.path().Append(base::FilePath(kWebDatabaseFilename));
   }
 
   // The textual contents of |file| are read from
-  // "components/test/data/web_database" and returned in the string |contents|.
+  // "chrome/test/data/web_database" and returned in the string |contents|.
   // Returns true if the file exists and is read successfully, false otherwise.
   bool GetWebDatabaseData(const base::FilePath& file, std::string* contents) {
-    base::FilePath source_path;
-    PathService::Get(base::DIR_SOURCE_ROOT, &source_path);
-    source_path = source_path.AppendASCII("components");
-    source_path = source_path.AppendASCII("test");
-    source_path = source_path.AppendASCII("data");
-    source_path = source_path.AppendASCII("web_database");
-    source_path = source_path.Append(file);
-    return file_util::PathExists(source_path) &&
-        file_util::ReadFileToString(source_path, contents);
+    base::FilePath path = ui_test_utils::GetTestFilePath(
+        base::FilePath(FILE_PATH_LITERAL("web_database")), file);
+    return file_util::PathExists(path) &&
+        file_util::ReadFileToString(path, contents);
   }
 
   static int VersionFromConnection(sql::Connection* connection) {
     // Get version.
     sql::Statement s(connection->GetUniqueStatement(
         "SELECT value FROM meta WHERE key='version'"));
     if (!s.Step())
       return 0;
     return s.ColumnInt(0);
   }
@@ skipping 1786 matching lines @@
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     // A new column should have been created in both tables.
     EXPECT_TRUE(connection.DoesColumnExist("autofill_profiles", "origin"));
     EXPECT_TRUE(connection.DoesColumnExist("credit_cards", "origin"));
   }
 }