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/extension_disabled_ui_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/extensions/extension_disabled_ui_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_disabled_ui_browsertest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 3aa3ced..31ca7b3 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -32,23 +32,23 @@ class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { virtual void SetUpOnMainThread() OVERRIDE { EXPECT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); service_ = browser()->profile()->GetExtensionService(); - FilePath pem_path = test_data_dir_. + base::FilePath pem_path = test_data_dir_. AppendASCII("permissions_increase").AppendASCII("permissions.pem"); path_v1_ = PackExtensionWithOptions( test_data_dir_.AppendASCII("permissions_increase").AppendASCII("v1"), scoped_temp_dir_.path().AppendASCII("permissions1.crx"), pem_path, - FilePath()); + base::FilePath()); path_v2_ = PackExtensionWithOptions( test_data_dir_.AppendASCII("permissions_increase").AppendASCII("v2"), scoped_temp_dir_.path().AppendASCII("permissions2.crx"), pem_path, - FilePath()); + base::FilePath()); path_v3_ = PackExtensionWithOptions( test_data_dir_.AppendASCII("permissions_increase").AppendASCII("v3"), scoped_temp_dir_.path().AppendASCII("permissions3.crx"), pem_path, - FilePath()); + base::FilePath()); } // Returns the ExtensionDisabledGlobalError, if present. @@ -73,7 +73,7 @@ class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { // extension and prompt the user to reenable. const Extension* UpdateIncreasingPermissionExtension( const Extension* extension, - const FilePath& crx_path, + const base::FilePath& crx_path, int expected_change) { size_t size_before = service_->extensions()->size(); if (UpdateExtension(extension->id(), crx_path, expected_change)) @@ -95,9 +95,9 @@ class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { ExtensionService* service_; base::ScopedTempDir scoped_temp_dir_; - FilePath path_v1_; - FilePath path_v2_; - FilePath path_v3_; + base::FilePath path_v1_; + base::FilePath path_v2_; + base::FilePath path_v3_; }; // Tests the process of updating an extension to one that requires higher |