diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-10 03:41:45 +0000 |
| commit | 650b2d5cdcab7d2c473c00d15b9f343f3a3405bb (patch) | |
| tree | 1343ea25d7d6086ac1279e1e0e32562b3b9b3477 /chrome/browser/chrome_main_browsertest.cc | |
| parent | 6f3638708ff440a2e80662ce49acc41cdad51ecd (diff) | |
| download | chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.zip chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.gz chromium_src-650b2d5cdcab7d2c473c00d15b9f343f3a3405bb.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chrome_main_browsertest.cc')
| -rw-r--r-- | chrome/browser/chrome_main_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index 7869654..bd61b98 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -46,8 +46,8 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunch) { } IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { - FilePath test_file_path = ui_test_utils::GetTestFilePath( - FilePath(), FilePath().AppendASCII("empty.html")); + base::FilePath test_file_path = ui_test_utils::GetTestFilePath( + base::FilePath(), base::FilePath().AppendASCII("empty.html")); CommandLine new_command_line(GetCommandLineForRelaunch()); new_command_line.AppendArgPath(test_file_path); content::WindowedNotificationObserver observer( @@ -75,8 +75,8 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, MAYBE_SecondLaunchWithIncognitoUrl) { ASSERT_EQ(1u, chrome::GetTabbedBrowserCount(browser()->profile())); // Run with --incognito switch and an URL specified. - FilePath test_file_path = ui_test_utils::GetTestFilePath( - FilePath(), FilePath().AppendASCII("empty.html")); + base::FilePath test_file_path = ui_test_utils::GetTestFilePath( + base::FilePath(), base::FilePath().AppendASCII("empty.html")); CommandLine new_command_line(GetCommandLineForRelaunch()); new_command_line.AppendSwitch(switches::kIncognito); new_command_line.AppendArgPath(test_file_path); @@ -115,8 +115,8 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { ASSERT_EQ(0u, chrome::GetTabbedBrowserCount(profile)); // Run with just an URL specified, no --incognito switch. - FilePath test_file_path = ui_test_utils::GetTestFilePath( - FilePath(), FilePath().AppendASCII("empty.html")); + base::FilePath test_file_path = ui_test_utils::GetTestFilePath( + base::FilePath(), base::FilePath().AppendASCII("empty.html")); CommandLine new_command_line(GetCommandLineForRelaunch()); new_command_line.AppendArgPath(test_file_path); content::WindowedNotificationObserver tab_observer( |