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/extensions/lazy_background_page_apitest.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/extensions/lazy_background_page_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/lazy_background_page_apitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index eeba1dd..bd4ea98 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -87,7 +87,7 @@ class LazyBackgroundPageApiTest : public ExtensionApiTest { // to dispatch the onInstalled event. We wait until it shuts down again. const Extension* LoadExtensionAndWait(const std::string& test_name) { LazyBackgroundObserver page_complete; - FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). + base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). AppendASCII(test_name); const Extension* extension = LoadExtension(extdir); if (extension) @@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, OnInstalled) { IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForView) { LazyBackgroundObserver page_complete; ResultCatcher catcher; - FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). + base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). AppendASCII("wait_for_view"); const Extension* extension = LoadExtension(extdir); ASSERT_TRUE(extension); @@ -239,7 +239,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForRequest) { LazyBackgroundObserver page_complete; ResultCatcher catcher; - FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). + base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). AppendASCII("wait_for_request"); const Extension* extension = LoadExtension(extdir); ASSERT_TRUE(extension); @@ -268,7 +268,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForRequest) { IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForNTP) { LazyBackgroundObserver lazybg; ResultCatcher catcher; - FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). + base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). AppendASCII("wait_for_ntp"); const Extension* extension = LoadExtension(extdir); ASSERT_TRUE(extension); @@ -303,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, IncognitoSplitMode) { // Load the extension with incognito enabled. { LoadedIncognitoObserver loaded(browser()->profile()); - FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). + base::FilePath extdir = test_data_dir_.AppendASCII("lazy_background_page"). AppendASCII("incognito_split"); ASSERT_TRUE(LoadExtensionIncognito(extdir)); loaded.Wait(); |