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

4 files changed, 30 insertions, 25 deletions

diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc
index 382bc81..e2bdc7b 100644
--- a/chrome/browser/diagnostics/diagnostics_model.cc
+++ b/chrome/browser/diagnostics/diagnostics_model.cc
@@ -165,7 +165,8 @@ class DiagnosticsModelPosix : public DiagnosticsModelImpl {
 }  // namespace
 
 DiagnosticsModel* MakeDiagnosticsModel(const CommandLine& cmdline) {
-  FilePath user_data_dir = cmdline.GetSwitchValuePath(switches::kUserDataDir);
+  base::FilePath user_data_dir =
+      cmdline.GetSwitchValuePath(switches::kUserDataDir);
   if (!user_data_dir.empty())
     PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
 #if defined(OS_WIN)
diff --git a/chrome/browser/diagnostics/diagnostics_test.cc b/chrome/browser/diagnostics/diagnostics_test.cc
index 390b0e2..2e46766 100644
--- a/chrome/browser/diagnostics/diagnostics_test.cc
+++ b/chrome/browser/diagnostics/diagnostics_test.cc
@@ -45,9 +45,9 @@ void DiagnosticTest::RecordOutcome(const string16& additional_info,
 }
 
 // static
-FilePath DiagnosticTest::GetUserDefaultProfileDir() {
-  FilePath path;
+base::FilePath DiagnosticTest::GetUserDefaultProfileDir() {
+  base::FilePath path;
   if (!PathService::Get(chrome::DIR_USER_DATA, &path))
-    return FilePath();
+    return base::FilePath();
   return path.AppendASCII(chrome::kInitialProfile);
 }
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index 3278eff..a924b6d 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -135,7 +135,7 @@ class InstallTypeTest : public DiagnosticTest {
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
 #if defined(OS_WIN)
-    FilePath chrome_exe;
+    base::FilePath chrome_exe;
     if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
       RecordFailure(ASCIIToUTF16("Path provider failure"));
       return false;
@@ -230,7 +230,7 @@ class PathTest : public DiagnosticTest {
       RecordStopFailure(ASCIIToUTF16("dependency failure"));
       return false;
     }
-    FilePath dir_or_file;
+    base::FilePath dir_or_file;
     if (!PathService::Get(path_info_.path_id, &dir_or_file)) {
       RecordStopFailure(ASCIIToUTF16("Path provider failure"));
       return false;
@@ -291,7 +291,7 @@ class DiskSpaceTest : public DiagnosticTest {
   virtual int GetId() OVERRIDE { return 0; }
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
-    FilePath data_dir;
+    base::FilePath data_dir;
     if (!PathService::Get(chrome::DIR_USER_DATA, &data_dir))
       return false;
     int64 disk_space = base::SysInfo::AmountOfFreeDiskSpace(data_dir);
@@ -315,7 +315,9 @@ class DiskSpaceTest : public DiagnosticTest {
 // Checks that a given json file can be correctly parsed.
 class JSONTest : public DiagnosticTest {
  public:
-  JSONTest(const FilePath& path, const string16& name, int64 max_file_size)
+  JSONTest(const base::FilePath& path,
+           const string16& name,
+           int64 max_file_size)
       : DiagnosticTest(name), path_(path), max_file_size_(max_file_size) {
   }
 
@@ -361,7 +363,7 @@ class JSONTest : public DiagnosticTest {
   }
 
  private:
-  FilePath path_;
+  base::FilePath path_;
   int64 max_file_size_;
   DISALLOW_COPY_AND_ASSIGN(JSONTest);
 };
@@ -405,19 +407,19 @@ DiagnosticTest* MakeInstallTypeTest() {
 }
 
 DiagnosticTest* MakePreferencesTest() {
-  FilePath path = DiagnosticTest::GetUserDefaultProfileDir();
+  base::FilePath path = DiagnosticTest::GetUserDefaultProfileDir();
   path = path.Append(chrome::kPreferencesFilename);
   return new JSONTest(path, ASCIIToUTF16("Profile JSON"), 100 * kOneKilo);
 }
 
 DiagnosticTest* MakeBookMarksTest() {
-  FilePath path = DiagnosticTest::GetUserDefaultProfileDir();
+  base::FilePath path = DiagnosticTest::GetUserDefaultProfileDir();
   path = path.Append(chrome::kBookmarksFileName);
   return new JSONTest(path, ASCIIToUTF16("BookMarks JSON"), 2 * kOneMeg);
 }
 
 DiagnosticTest* MakeLocalStateTest() {
-  FilePath path;
+  base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(chrome::kLocalStateFilename);
   return new JSONTest(path, ASCIIToUTF16("Local State JSON"), 50 * kOneKilo);
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 406b7b49..07dd702 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -26,7 +26,7 @@ namespace {
 class SqliteIntegrityTest : public DiagnosticTest {
  public:
   SqliteIntegrityTest(bool critical, const string16& title,
-                      const FilePath& profile_relative_db_path)
+                      const base::FilePath& profile_relative_db_path)
       : DiagnosticTest(title),
         critical_(critical),
         db_path_(profile_relative_db_path) {
@@ -35,7 +35,7 @@ class SqliteIntegrityTest : public DiagnosticTest {
   virtual int GetId() OVERRIDE { return 0; }
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
-    FilePath path = GetUserDefaultProfileDir();
+    base::FilePath path = GetUserDefaultProfileDir();
     path = path.Append(db_path_);
     if (!file_util::PathExists(path)) {
       RecordOutcome(ASCIIToUTF16("File not found"),
@@ -83,7 +83,7 @@ class SqliteIntegrityTest : public DiagnosticTest {
 
  private:
   bool critical_;
-  FilePath db_path_;
+  base::FilePath db_path_;
   DISALLOW_COPY_AND_ASSIGN(SqliteIntegrityTest);
 };
 
@@ -91,39 +91,41 @@ class SqliteIntegrityTest : public DiagnosticTest {
 
 DiagnosticTest* MakeSqliteWebDbTest() {
   return new SqliteIntegrityTest(true, ASCIIToUTF16("Web DB"),
-                                 FilePath(chrome::kWebDataFilename));
+                                 base::FilePath(chrome::kWebDataFilename));
 }
 
 DiagnosticTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(true, ASCIIToUTF16("Cookies DB"),
-                                 FilePath(chrome::kCookieFilename));
+                                 base::FilePath(chrome::kCookieFilename));
 }
 
 DiagnosticTest* MakeSqliteHistoryDbTest() {
   return new SqliteIntegrityTest(true, ASCIIToUTF16("History DB"),
-                                 FilePath(chrome::kHistoryFilename));
+                                 base::FilePath(chrome::kHistoryFilename));
 }
 
 DiagnosticTest* MakeSqliteArchivedHistoryDbTest() {
-  return new SqliteIntegrityTest(false, ASCIIToUTF16("Archived History DB"),
-                                 FilePath(chrome::kArchivedHistoryFilename));
+  return new SqliteIntegrityTest(
+      false, ASCIIToUTF16("Archived History DB"),
+      base::FilePath(chrome::kArchivedHistoryFilename));
 }
 
 DiagnosticTest* MakeSqliteThumbnailsDbTest() {
   return new SqliteIntegrityTest(false, ASCIIToUTF16("Thumbnails DB"),
-                                 FilePath(chrome::kThumbnailsFilename));
+                                 base::FilePath(chrome::kThumbnailsFilename));
 }
 
 DiagnosticTest* MakeSqliteAppCacheDbTest() {
-  FilePath appcache_dir(content::kAppCacheDirname);
-  FilePath appcache_db = appcache_dir.Append(appcache::kAppCacheDatabaseName);
+  base::FilePath appcache_dir(content::kAppCacheDirname);
+  base::FilePath appcache_db =
+      appcache_dir.Append(appcache::kAppCacheDatabaseName);
   return new SqliteIntegrityTest(false, ASCIIToUTF16("AppCache DB"),
                                  appcache_db);
 }
 
 DiagnosticTest* MakeSqliteWebDatabaseTrackerDbTest() {
-  FilePath databases_dir(webkit_database::kDatabaseDirectoryName);
-  FilePath tracker_db =
+  base::FilePath databases_dir(webkit_database::kDatabaseDirectoryName);
+  base::FilePath tracker_db =
       databases_dir.Append(webkit_database::kTrackerDatabaseFileName);
   return new SqliteIntegrityTest(false, ASCIIToUTF16("DatabaseTracker DB"),
                                  tracker_db);