Commit 650b2d5c authored by brettw@chromium.org's avatar brettw@chromium.org
Browse files

Merge branch 'master' into file_path_browser

version control markers

Merge branch 'master' into file_path_browser

remove version control

Fix typo

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/intents/native_services_browsertest.cc
	chrome/browser/ui/intents/native_file_picker_service.cc

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/chromeos/drive/drive_file_system.cc
	chrome/browser/chromeos/drive/drive_file_system.h
	chrome/browser/chromeos/drive/drive_file_system_interface.h
	chrome/browser/chromeos/drive/drive_file_system_unittest.cc
	chrome/browser/chromeos/drive/file_system/drive_operations.cc
	chrome/browser/chromeos/login/wallpaper_manager.cc
	chrome/browser/chromeos/login/wallpaper_manager.h
	chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
	chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
	chrome/browser/google_apis/gdata_wapi_operations.cc
	chrome/browser/google_apis/gdata_wapi_operations.h
	chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
	chrome/browser/profiles/off_the_record_profile_impl.cc
	chrome/browser/profiles/off_the_record_profile_impl.h
	chrome/browser/profiles/profile_impl.cc
	chrome/browser/profiles/profile_impl.h
	chrome/browser/profiles/profile_impl_io_data.cc
	chrome/browser/profiles/profile_impl_io_data.h
	chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
	chrome/browser/ui/webui/options/manage_profile_handler.cc

Long lines

long lines

some long lines.

long lines

long lines

Beginning of lines.

Rename FilePath -> base::FilePath in chrome/browser

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
parent 6f363870
......@@ -59,7 +59,7 @@ CrashDumpManager::~CrashDumpManager() {
int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER));
FilePath minidump_path;
base::FilePath minidump_path;
if (!file_util::CreateTemporaryFile(&minidump_path))
return base::kInvalidPlatformFileValue;
......@@ -83,7 +83,7 @@ int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
return minidump_file;
}
void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
int64 file_size = 0;
......@@ -101,7 +101,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
// We are dealing with a valid minidump. Copy it to the crash report
// directory from where Java code will upload it later on.
FilePath crash_dump_dir;
base::FilePath crash_dump_dir;
r = PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
if (!r) {
NOTREACHED() << "Failed to retrieve the crash dump directory.";
......@@ -112,7 +112,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
const std::string filename =
base::StringPrintf("chromium-renderer-minidump-%016" PRIx64 ".dmp%d",
rand, pid);
FilePath dest_path = crash_dump_dir.Append(filename);
base::FilePath dest_path = crash_dump_dir.Append(filename);
r = file_util::Move(minidump_path, dest_path);
if (!r) {
LOG(ERROR) << "Failed to move crash dump from " << minidump_path.value()
......@@ -153,7 +153,7 @@ void CrashDumpManager::Observe(int type,
NOTREACHED();
return;
}
FilePath minidump_path;
base::FilePath minidump_path;
{
base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
ChildProcessIDToMinidumpPath::iterator iter =
......
......@@ -45,9 +45,9 @@ class CrashDumpManager : public content::NotificationObserver {
// Should be created on the UI thread.
CrashDumpManager();
typedef std::map<int, FilePath> ChildProcessIDToMinidumpPath;
typedef std::map<int, base::FilePath> ChildProcessIDToMinidumpPath;
static void ProcessMinidump(const FilePath& minidump_path,
static void ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid);
// NotificationObserver implementation:
......
......@@ -56,8 +56,8 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
return use_bundled_frontend_resources_;
}
virtual FilePath GetDebugFrontendDir() {
return FilePath();
virtual base::FilePath GetDebugFrontendDir() {
return base::FilePath();
}
virtual std::string GetPageThumbnailData(const GURL& url) {
......
......@@ -157,7 +157,7 @@ void RecordLastRunAppBundlePath() {
// real, user-visible app bundle directory. (The alternatives give either the
// framework's path or the initial app's path, which may be an app mode shim
// or a unit test.)
FilePath appBundlePath =
base::FilePath appBundlePath =
chrome::GetVersionedDirectory().DirName().DirName().DirName();
CFPreferencesSetAppValue(
base::mac::NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey),
......@@ -1022,7 +1022,7 @@ void RecordLastRunAppBundlePath() {
int return_code;
StartupBrowserCreator browser_creator;
browser_creator.LaunchBrowser(
command_line, [self lastProfile], FilePath(),
command_line, [self lastProfile], base::FilePath(),
chrome::startup::IS_NOT_PROCESS_STARTUP,
chrome::startup::IS_NOT_FIRST_RUN, &return_code);
}
......@@ -1126,7 +1126,7 @@ void RecordLastRunAppBundlePath() {
CommandLine dummy(CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(FilePath(), dummy, first_run);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
launch.OpenURLsInBrowser(browser, false, urls);
}
......@@ -1151,7 +1151,7 @@ void RecordLastRunAppBundlePath() {
stringValue];
ProfileManager* profileManager = g_browser_process->profile_manager();
FilePath path = FilePath(base::SysNSStringToUTF8(profileDir));
base::FilePath path = base::FilePath(base::SysNSStringToUTF8(profileDir));
path = profileManager->user_data_dir().Append(path);
Profile* profile = profileManager->GetProfile(path);
if (!profile) {
......@@ -1192,7 +1192,7 @@ void RecordLastRunAppBundlePath() {
string16 printTicket16 = base::SysNSStringToUTF16(printTicket);
print_dialog_cloud::CreatePrintDialogForFile(
ProfileManager::GetDefaultProfile(), NULL,
FilePath([inputPath UTF8String]), title16,
base::FilePath([inputPath UTF8String]), title16,
printTicket16, [mime UTF8String], /*delete_on_close=*/false);
}
}
......@@ -1201,7 +1201,8 @@ void RecordLastRunAppBundlePath() {
openFiles:(NSArray*)filenames {
std::vector<GURL> gurlVector;
for (NSString* file in filenames) {
GURL gurl = net::FilePathToFileURL(FilePath(base::SysNSStringToUTF8(file)));
GURL gurl =
net::FilePathToFileURL(base::FilePath(base::SysNSStringToUTF8(file)));
gurlVector.push_back(gurl);
}
if (!gurlVector.empty())
......
......@@ -255,8 +255,9 @@ class AutofillTest : public InProcessBrowserTest {
CHECK(test_server()->Start());
std::string data;
FilePath data_file = ui_test_utils::GetTestFilePath(
FilePath().AppendASCII("autofill"), FilePath().AppendASCII(filename));
base::FilePath data_file =
ui_test_utils::GetTestFilePath(base::FilePath().AppendASCII("autofill"),
base::FilePath().AppendASCII(filename));
CHECK(file_util::ReadFileToString(data_file, &data));
std::vector<std::string> lines;
base::SplitString(data, '\n', &lines);
......
......@@ -20,8 +20,8 @@
namespace {
const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
const char kFieldSeparator[] = ": ";
const char kProfileSeparator[] = "---";
......
......@@ -14,7 +14,7 @@ namespace {
// Reads |file| into |content|, and converts Windows line-endings to Unix ones.
// Returns true on success.
bool ReadFile(const FilePath& file, std::string* content) {
bool ReadFile(const base::FilePath& file, std::string* content) {
if (!file_util::ReadFileToString(file, content))
return false;
......@@ -23,7 +23,7 @@ bool ReadFile(const FilePath& file, std::string* content) {
}
// Write |content| to |file|. Returns true on success.
bool WriteFile(const FilePath& file, const std::string& content) {
bool WriteFile(const base::FilePath& file, const std::string& content) {
int write_size = file_util::WriteFile(file, content.c_str(),
content.length());
return write_size == static_cast<int>(content.length());
......@@ -32,15 +32,15 @@ bool WriteFile(const FilePath& file, const std::string& content) {
} // namespace
void DataDrivenTest::RunDataDrivenTest(
const FilePath& input_directory,
const FilePath& output_directory,
const FilePath::StringType& file_name_pattern) {
const base::FilePath& input_directory,
const base::FilePath& output_directory,
const base::FilePath::StringType& file_name_pattern) {
file_util::FileEnumerator input_files(input_directory,
false,
file_util::FileEnumerator::FILES,
file_name_pattern);
for (FilePath input_file = input_files.Next();
for (base::FilePath input_file = input_files.Next();
!input_file.empty();
input_file = input_files.Next()) {
SCOPED_TRACE(input_file.BaseName().value());
......@@ -51,7 +51,7 @@ void DataDrivenTest::RunDataDrivenTest(
std::string output;
GenerateResults(input, &output);
FilePath output_file = output_directory.Append(
base::FilePath output_file = output_directory.Append(
input_file.BaseName().StripTrailingSeparators().ReplaceExtension(
FILE_PATH_LITERAL(".out")));
......@@ -63,9 +63,9 @@ void DataDrivenTest::RunDataDrivenTest(
}
}
FilePath DataDrivenTest::GetInputDirectory(
const FilePath::StringType& test_name) {
FilePath test_data_dir_;
base::FilePath DataDrivenTest::GetInputDirectory(
const base::FilePath::StringType& test_name) {
base::FilePath test_data_dir_;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("autofill")
.Append(test_name)
......@@ -73,9 +73,9 @@ FilePath DataDrivenTest::GetInputDirectory(
return test_data_dir_;
}
FilePath DataDrivenTest::GetOutputDirectory(
const FilePath::StringType& test_name) {
FilePath test_data_dir_;
base::FilePath DataDrivenTest::GetOutputDirectory(
const base::FilePath::StringType& test_name) {
base::FilePath test_data_dir_;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
test_data_dir_ = test_data_dir_.AppendASCII("autofill")
.Append(test_name)
......
......@@ -22,9 +22,9 @@ class DataDrivenTest {
// |GenerateResults()|. If the corresponding output file already exists in
// the |output_directory|, verifies that the results match the file contents;
// otherwise, writes a gold result file to the |output_directory|.
void RunDataDrivenTest(const FilePath& input_directory,
const FilePath& output_directory,
const FilePath::StringType& file_name_pattern);
void RunDataDrivenTest(const base::FilePath& input_directory,
const base::FilePath& output_directory,
const base::FilePath::StringType& file_name_pattern);
// Given the |input| data, generates the |output| results. The output results
// must be stable across runs.
......@@ -33,10 +33,11 @@ class DataDrivenTest {
virtual void GenerateResults(const std::string& input,
std::string* output) = 0;
// Return |FilePath|s to the test input and output subdirectories
// Return |base::FilePath|s to the test input and output subdirectories
// ../autofill/|test_name|/input and ../autofill/|test_name|/output.
FilePath GetInputDirectory(const FilePath::StringType& test_name);
FilePath GetOutputDirectory(const FilePath::StringType& test_name);
base::FilePath GetInputDirectory(const base::FilePath::StringType& test_name);
base::FilePath GetOutputDirectory(
const base::FilePath::StringType& test_name);
protected:
DataDrivenTest();
......
......@@ -20,7 +20,7 @@
namespace {
const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("heuristics");
const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("heuristics");
// Convert the |html| snippet to a data URI.
GURL HTMLToDataURI(const std::string& html) {
......@@ -104,14 +104,16 @@ std::string FormStructureBrowserTest::FormStructuresToString(
#define MAYBE_DataDrivenHeuristics(n) DataDrivenHeuristics##n
#endif
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics00) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("00_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("00_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
}
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics01) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("01_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("01_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -119,7 +121,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics01) {
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(02)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("02_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("02_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -127,7 +130,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(03)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("03_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("03_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -135,7 +139,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(04)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("04_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("04_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -143,7 +148,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(05)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("05_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("05_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -151,7 +157,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(06)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("06_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("06_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -159,7 +166,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(07)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("07_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("07_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -167,7 +175,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(08)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("08_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("08_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -175,7 +184,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(09)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("09_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("09_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -183,7 +193,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(10)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("10_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("10_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -191,7 +202,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(11)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("11_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("11_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -199,7 +211,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(12)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("12_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("12_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -207,7 +220,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(13)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("13_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("13_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -215,7 +229,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(14)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("14_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("14_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -223,7 +238,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(15)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("15_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("15_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -231,7 +247,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(16)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("16_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("16_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -239,7 +256,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(17)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("17_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("17_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......@@ -247,7 +265,8 @@ IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
MAYBE_DataDrivenHeuristics(20)) {
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("20_*.html");
const base::FilePath::CharType kFileNamePattern[] =
FILE_PATH_LITERAL("20_*.html");
RunDataDrivenTest(GetInputDirectory(kTestName),
GetOutputDirectory(kTestName),
kFileNamePattern);
......
......@@ -1745,7 +1745,7 @@ void SavePackageNotificationObserver::ManagerGoingDown(
PageSnapshotTaker::PageSnapshotTaker(AutomationProvider* automation,
IPC::Message* reply_message,
WebContents* web_contents,
const FilePath& path)
const base::FilePath& path)
: automation_(automation->AsWeakPtr()),
reply_message_(reply_message),
web_contents_(web_contents),
......
......@@ -1274,7 +1274,7 @@ class PageSnapshotTaker : public TabEventObserver,
PageSnapshotTaker(AutomationProvider* automation,
IPC::Message* reply_message,
content::WebContents* web_contents,
const FilePath& path);
const base::FilePath& path);
virtual ~PageSnapshotTaker();
// Start the process of taking a snapshot of the entire page.
......@@ -1298,7 +1298,7 @@ class PageSnapshotTaker : public TabEventObserver,
base::WeakPtr<AutomationProvider> automation_;
scoped_ptr<IPC::Message> reply_message_;
content::WebContents* web_contents_;
FilePath image_path_;
base::FilePath image_path_;
content::NotificationRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(PageSnapshotTaker);
......
......@@ -107,7 +107,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
}
protected:
FilePath test_data_dir_;
base::FilePath test_data_dir_;
};
IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, FormSubmission) {
......
......@@ -202,7 +202,7 @@ void SendSuccessReply(base::WeakPtr<AutomationProvider> automation,
// Helper to process the result of CanEnablePlugin.
void DidEnablePlugin(base::WeakPtr<AutomationProvider> automation,
IPC::Message* reply_message,
const FilePath::StringType& path,
const base::FilePath::StringType& path,
const std::string& error_msg,
bool did_enable) {
if (did_enable) {
......@@ -1155,13 +1155,13 @@ void TestingAutomationProvider::CloseBrowserWindow(
void TestingAutomationProvider::OpenProfileWindow(
base::DictionaryValue* args, IPC::Message* reply_message) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
FilePath::StringType path;
base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError(
"Invalid or missing arg: 'path'");
return;
}
Profile* profile = profile_manager->GetProfileByPath(FilePath(path));
Profile* profile = profile_manager->GetProfileByPath(base::FilePath(path));
if (!profile) {
AutomationJSONReply(this, reply_message).SendError(
StringPrintf("Invalid profile path: %s", path.c_str()));
......@@ -2241,7 +2241,7 @@ void TestingAutomationProvider::GetBrowserInfo(
chrome::kHelperProcessExecutablePath);
properties->SetString("command_line_string",
CommandLine::ForCurrentProcess()->GetCommandLineString());
FilePath dumps_path;
base::FilePath dumps_path;
PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path);
properties->SetString("DIR_CRASH_DUMPS", dumps_path.value());
#if defined(USE_AURA)
......@@ -2633,7 +2633,7 @@ void TestingAutomationProvider::PerformActionOnDownload(
} else if (action == "toggle_open_files_like_this") {
DownloadPrefs* prefs =
DownloadPrefs::FromBrowserContext(selected_item->GetBrowserContext());
FilePath path = selected_item->GetUserVerifiedFilePath();
base::FilePath path = selected_item->GetUserVerifiedFilePath();
if (!selected_item->ShouldOpenFileBasedOnExtension())
prefs->EnableAutoOpenBasedOnExtension(path);
else
......@@ -3187,13 +3187,13 @@ void TestingAutomationProvider::GetPluginsInfoCallback(
void TestingAutomationProvider::EnablePlugin(Browser* browser,
DictionaryValue* args,
IPC::Message* reply_message) {
FilePath::StringType path;
base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError("path not specified.");
return;
}
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
plugin_prefs->EnablePlugin(true, FilePath(path),
plugin_prefs->EnablePlugin(true, base::FilePath(path),
base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
path, "Could not enable plugin for path %s."));
}
......@@ -3204,13 +3204,13 @@ void TestingAutomationProvider::EnablePlugin(Browser* browser,
void TestingAutomationProvider::DisablePlugin(Browser* browser,
DictionaryValue* args,
IPC::Message* reply_message) {
FilePath::StringType path;
base::FilePath::StringType path;
if (!args->GetString("path", &path)) {
AutomationJSONReply(this, reply_message).SendError("path not specified.");
return;
}
PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
plugin_prefs->EnablePlugin(false, FilePath(path),
plugin_prefs->EnablePlugin(false, base::FilePath(path),
base::Bind(&DidEnablePlugin, AsWeakPtr(), reply_message,
path, "Could not disable plugin for path %s."));
}
......@@ -3226,8 +3226,8 @@ void TestingAutomationProvider::SaveTabContents(
DictionaryValue* args,
IPC::Message* reply_message) {
int tab_index = 0;
FilePath::StringType filename;
FilePath::StringType parent_directory;
base::FilePath::StringType filename;
base::FilePath::StringType parent_directory;
WebContents* web_contents = NULL;
if (!args->GetInteger("tab_index", &tab_index) ||
......@@ -3244,10 +3244,10 @@ void TestingAutomationProvider::SaveTabContents(
}
// We're doing a SAVE_AS_ONLY_HTML so the the directory path isn't
// used. Nevertheless, SavePackage requires it be valid. Sigh.
parent_directory = FilePath(filename).DirName().value();
parent_directory = base::FilePath(filename).DirName().value();
if (!web_contents->SavePage(
FilePath(filename),
FilePath(parent_directory),
base::FilePath(filename),
base::FilePath(parent_directory),
content::SAVE_PAGE_TYPE_AS_ONLY_HTML)) {
AutomationJSONReply(this, reply_message).SendError(
"Could not initiate SavePage");
......@@ -3578,7 +3578,7 @@ void TestingAutomationProvider::IsFindInPageVisible(
void TestingAutomationProvider::InstallExtension(
DictionaryValue* args, IPC::Message* reply_message) {
FilePath::StringType path_string;
base::FilePath::StringType path_string;
bool with_ui;
bool from_webstore = false;
Browser* browser;
......@@ -3612,7 +3612,7 @@ void TestingAutomationProvider::InstallExtension(
this,
reply_message);
FilePath extension_path(path_string);
base::FilePath extension_path(path_string);
// If the given path has a 'crx' extension, assume it is a packed extension
// and install it. Otherwise load it as an unpacked extension.
if (extension_path.MatchesExtension(FILE_PATH_LITERAL(".crx"))) {
......@@ -5482,7 +5482,7 @@ void TestingAutomationProvider::CaptureEntirePageJSON(
return;
}
FilePath::StringType path_str;