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

6 files changed, 13 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/contacts/contact_database.cc b/chrome/browser/chromeos/contacts/contact_database.cc
index 0de9835..d727a30 100644
--- a/chrome/browser/chromeos/contacts/contact_database.cc
+++ b/chrome/browser/chromeos/contacts/contact_database.cc
@@ -70,7 +70,7 @@ void ContactDatabase::DestroyOnUIThread() {
                  base::Unretained(this)));
 }
 
-void ContactDatabase::Init(const FilePath& database_dir,
+void ContactDatabase::Init(const base::FilePath& database_dir,
                            InitCallback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   bool* success = new bool(false);
@@ -168,7 +168,7 @@ void ContactDatabase::RunLoadCallback(
   callback.Run(*success, contacts.Pass(), metadata.Pass());
 }
 
-void ContactDatabase::InitFromTaskRunner(const FilePath& database_dir,
+void ContactDatabase::InitFromTaskRunner(const base::FilePath& database_dir,
                                          bool* success) {
   DCHECK(IsRunByTaskRunner());
   DCHECK(success);
diff --git a/chrome/browser/chromeos/contacts/contact_database.h b/chrome/browser/chromeos/contacts/contact_database.h
index e74e7ef..053f8da 100644
--- a/chrome/browser/chromeos/contacts/contact_database.h
+++ b/chrome/browser/chromeos/contacts/contact_database.h
@@ -48,7 +48,8 @@ class ContactDatabaseInterface {
 
   // Asynchronously initializes the object.  |callback| will be invoked on the
   // UI thread when complete.
-  virtual void Init(const FilePath& database_dir, InitCallback callback) = 0;
+  virtual void Init(const base::FilePath& database_dir,
+                    InitCallback callback) = 0;
 
   // Asynchronously saves |contacts_to_save| and |metadata| to the database and
   // removes contacts with IDs contained in |contact_ids_to_delete|.  If
@@ -76,7 +77,7 @@ class ContactDatabase : public ContactDatabaseInterface {
 
   // ContactDatabaseInterface implementation.
   virtual void DestroyOnUIThread() OVERRIDE;
-  virtual void Init(const FilePath& database_dir,
+  virtual void Init(const base::FilePath& database_dir,
                     InitCallback callback) OVERRIDE;
   virtual void SaveContacts(scoped_ptr<ContactPointers> contacts_to_save,
                             scoped_ptr<ContactIds> contact_ids_to_delete,
@@ -107,7 +108,7 @@ class ContactDatabase : public ContactDatabaseInterface {
                        scoped_ptr<UpdateMetadata> metadata);
 
   // Initializes the database in |database_dir| and updates |success|.
-  void InitFromTaskRunner(const FilePath& database_dir, bool* success);
+  void InitFromTaskRunner(const base::FilePath& database_dir, bool* success);
 
   // Saves data to disk and updates |success|.
   void SaveContactsFromTaskRunner(scoped_ptr<ContactPointers> contacts_to_save,
diff --git a/chrome/browser/chromeos/contacts/contact_database_unittest.cc b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
index 08e09cd..96e2768 100644
--- a/chrome/browser/chromeos/contacts/contact_database_unittest.cc
+++ b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
@@ -27,7 +27,7 @@ namespace test {
 
 // Name of the directory created within a temporary directory to store the
 // contacts database.
-const FilePath::CharType kDatabaseDirectoryName[] =
+const base::FilePath::CharType kDatabaseDirectoryName[] =
     FILE_PATH_LITERAL("contacts");
 
 class ContactDatabaseTest : public testing::Test {
@@ -52,7 +52,7 @@ class ContactDatabaseTest : public testing::Test {
   }
 
  protected:
-  FilePath database_path() const {
+  base::FilePath database_path() const {
     return temp_dir_.path().Append(kDatabaseDirectoryName);
   }
 
@@ -316,7 +316,7 @@ TEST_F(ContactDatabaseTest, DeleteWhenCorrupt) {
   // Overwrite all of the files in the database with a space character.
   file_util::FileEnumerator enumerator(
       database_path(), false, file_util::FileEnumerator::FILES);
-  for (FilePath path = enumerator.Next(); !path.empty();
+  for (base::FilePath path = enumerator.Next(); !path.empty();
        path = enumerator.Next()) {
     file_util::WriteFile(path, " ", 1);
   }
diff --git a/chrome/browser/chromeos/contacts/fake_contact_database.cc b/chrome/browser/chromeos/contacts/fake_contact_database.cc
index 0ce9aab..00b30b8 100644
--- a/chrome/browser/chromeos/contacts/fake_contact_database.cc
+++ b/chrome/browser/chromeos/contacts/fake_contact_database.cc
@@ -19,7 +19,7 @@ FakeContactDatabase::FakeContactDatabase()
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-void FakeContactDatabase::Init(const FilePath& database_dir,
+void FakeContactDatabase::Init(const base::FilePath& database_dir,
                                InitCallback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   callback.Run(init_success_);
diff --git a/chrome/browser/chromeos/contacts/fake_contact_database.h b/chrome/browser/chromeos/contacts/fake_contact_database.h
index bcadc4e..9263ef6 100644
--- a/chrome/browser/chromeos/contacts/fake_contact_database.h
+++ b/chrome/browser/chromeos/contacts/fake_contact_database.h
@@ -34,7 +34,7 @@ class FakeContactDatabase : public ContactDatabaseInterface {
 
   // ContactDatabaseInterface implementation.
   virtual void DestroyOnUIThread() OVERRIDE;
-  virtual void Init(const FilePath& database_dir,
+  virtual void Init(const base::FilePath& database_dir,
                     InitCallback callback) OVERRIDE;
   virtual void SaveContacts(scoped_ptr<ContactPointers> contacts_to_save,
                             scoped_ptr<ContactIds> contact_ids_to_delete,
diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc
index 43b6a71..ee46ac1 100644
--- a/chrome/browser/chromeos/contacts/google_contact_store.cc
+++ b/chrome/browser/chromeos/contacts/google_contact_store.cc
@@ -27,7 +27,7 @@ namespace {
 
 // Name of the directory within the profile directory where the contact database
 // is stored.
-const FilePath::CharType kDatabaseDirectoryName[] =
+const base::FilePath::CharType kDatabaseDirectoryName[] =
     FILE_PATH_LITERAL("Google Contacts");
 
 // We wait this long after the last update has completed successfully before
@@ -125,7 +125,7 @@ void GoogleContactStore::Init() {
     gdata_service_->Initialize();
   }
 
-  FilePath db_path = profile_->GetPath().Append(kDatabaseDirectoryName);
+  base::FilePath db_path = profile_->GetPath().Append(kDatabaseDirectoryName);
   VLOG(1) << "Initializing contact database \"" << db_path.value() << "\" for "
           << profile_->GetProfileName();
   db_->Init(db_path,