Index: chrome/browser/browsing_data_local_storage_helper_browsertest.cc |
=================================================================== |
--- chrome/browser/browsing_data_local_storage_helper_browsertest.cc (revision 96265) |
+++ chrome/browser/browsing_data_local_storage_helper_browsertest.cc (working copy) |
@@ -12,8 +12,9 @@ |
#include "base/test/thread_test_helper.h" |
#include "chrome/browser/browsing_data_helper_browsertest.h" |
#include "chrome/browser/browsing_data_local_storage_helper.h" |
+#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/ui/browser.h" |
#include "chrome/test/base/in_process_browser_test.h" |
-#include "chrome/test/base/testing_profile.h" |
#include "chrome/test/base/ui_test_utils.h" |
#include "content/browser/in_process_webkit/webkit_context.h" |
#include "content/browser/in_process_webkit/webkit_thread.h" |
@@ -52,12 +53,11 @@ |
} |
FilePath GetLocalStoragePathForTestingProfile() { |
- FilePath storage_path(testing_profile_.GetPath()); |
+ FilePath storage_path(browser()->profile()->GetPath()); |
storage_path = storage_path.Append( |
DOMStorageContext::kLocalStorageDirectory); |
return storage_path; |
} |
- TestingProfile testing_profile_; |
}; |
// This class is notified by BrowsingDataLocalStorageHelper on the UI thread |
@@ -101,7 +101,7 @@ |
IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) { |
scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper( |
- new BrowsingDataLocalStorageHelper(&testing_profile_)); |
+ new BrowsingDataLocalStorageHelper(browser()->profile())); |
CreateLocalStorageFilesForTest(); |
StopTestOnCallback stop_test_on_callback(local_storage_helper); |
local_storage_helper->StartFetching( |
@@ -112,7 +112,7 @@ |
IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) { |
scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper( |
- new BrowsingDataLocalStorageHelper(&testing_profile_)); |
+ new BrowsingDataLocalStorageHelper(browser()->profile())); |
CreateLocalStorageFilesForTest(); |
local_storage_helper->DeleteLocalStorageFile( |
GetLocalStoragePathForTestingProfile().Append(FilePath(kTestFile0))); |
@@ -145,7 +145,7 @@ |
FILE_PATH_LITERAL("http_host2_1.localstorage"); |
scoped_refptr<CannedBrowsingDataLocalStorageHelper> helper( |
- new CannedBrowsingDataLocalStorageHelper(&testing_profile_)); |
+ new CannedBrowsingDataLocalStorageHelper(browser()->profile())); |
helper->AddLocalStorage(origin1); |
helper->AddLocalStorage(origin2); |
@@ -167,7 +167,7 @@ |
FILE_PATH_LITERAL("http_host1_1.localstorage"); |
scoped_refptr<CannedBrowsingDataLocalStorageHelper> helper( |
- new CannedBrowsingDataLocalStorageHelper(&testing_profile_)); |
+ new CannedBrowsingDataLocalStorageHelper(browser()->profile())); |
helper->AddLocalStorage(origin); |
helper->AddLocalStorage(origin); |