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

1 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index d87dcb5..417f21a 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -43,7 +43,7 @@ class ContentSettingsTest : public InProcessBrowserTest {
       : https_server_(
             net::TestServer::TYPE_HTTPS,
             net::TestServer::SSLOptions(net::TestServer::SSLOptions::CERT_OK),
-            FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
+            base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ -199,7 +199,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest,
   // NOTE: don't use test_server here, since we need the port to be the same
   // across the restart.
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
-      FilePath(FILE_PATH_LITERAL("setcookie.html")));
+      base::FilePath(FILE_PATH_LITERAL("setcookie.html")));
   CookieSettings* settings =
       CookieSettings::Factory::GetForProfile(browser()->profile());
   settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
@@ -217,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest,
 IN_PROC_BROWSER_TEST_F(ContentSettingsTest,
                        AllowCookiesForASessionUsingExceptions) {
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
-      FilePath(FILE_PATH_LITERAL("setcookie.html")));
+      base::FilePath(FILE_PATH_LITERAL("setcookie.html")));
   ASSERT_TRUE(GetCookies(browser()->profile(), url).empty());
 }
 
@@ -292,7 +292,7 @@ class ClickToPlayPluginTest : public ContentSettingsTest {
 
 #if defined(OS_MACOSX)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    FilePath plugin_dir;
+    base::FilePath plugin_dir;
     PathService::Get(base::DIR_MODULE, &plugin_dir);
     plugin_dir = plugin_dir.AppendASCII("plugins");
     // The plugins directory isn't read by default on the Mac, so it needs to be
@@ -307,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) {
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
-      FilePath(), FilePath().AppendASCII("clicktoplay.html"));
+      base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title(ASCIIToUTF16("OK"));
@@ -318,7 +318,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) {
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
   ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance();
   int process_id = host->GetProcess()->GetID();
-  FilePath path(FILE_PATH_LITERAL("blah"));
+  base::FilePath path(FILE_PATH_LITERAL("blah"));
   EXPECT_FALSE(filter->CanLoadPlugin(process_id, path));
   filter->AuthorizeAllPlugins(process_id);
   EXPECT_TRUE(filter->CanLoadPlugin(process_id, path));
@@ -331,7 +331,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) {
 // Verify that plugins can be allowed on a domain by adding an exception
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, AllowException) {
   GURL url = ui_test_utils::GetTestUrl(
-      FilePath(), FilePath().AppendASCII("clicktoplay.html"));
+      base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
 
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
@@ -352,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, AllowException) {
 // Verify that plugins can be blocked on a domain by adding an exception.
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, BlockException) {
   GURL url = ui_test_utils::GetTestUrl(
-      FilePath(), FilePath().AppendASCII("clicktoplay.html"));
+      base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
 
   browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURL(url),
@@ -373,7 +373,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) {
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
-      FilePath(), FilePath().AppendASCII("load_all_blocked_plugins.html"));
+      base::FilePath(),
+      base::FilePath().AppendASCII("load_all_blocked_plugins.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title1(ASCIIToUTF16("1"));
@@ -430,7 +431,8 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, DeleteSelfAtLoad) {
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
-      FilePath(), FilePath().AppendASCII("plugin_delete_self_at_load.html"));
+      base::FilePath(),
+      base::FilePath().AppendASCII("plugin_delete_self_at_load.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 expected_title(ASCIIToUTF16("OK"));