| OLD | NEW |
| 1 #include <vector> | 1 #include <vector> |
| 2 | 2 |
| 3 #include "base/command_line.h" | 3 #include "base/command_line.h" |
| 4 #include "base/file_path.h" | 4 #include "base/file_path.h" |
| 5 #include "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
| 8 #include "chrome/browser/extensions/extensions_service.h" | 8 #include "chrome/browser/extensions/extensions_service.h" |
| 9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
| 10 #include "chrome/browser/tab_contents/tab_contents.h" | 10 #include "chrome/browser/tab_contents/tab_contents.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 FilePath profile_dir; | 38 FilePath profile_dir; |
| 39 PathService::Get(chrome::DIR_USER_DATA, &profile_dir); | 39 PathService::Get(chrome::DIR_USER_DATA, &profile_dir); |
| 40 profile_dir = profile_dir.AppendASCII("Default"); | 40 profile_dir = profile_dir.AppendASCII("Default"); |
| 41 file_util::CreateDirectory(profile_dir); | 41 file_util::CreateDirectory(profile_dir); |
| 42 | 42 |
| 43 preferences_file_ = profile_dir.AppendASCII("Preferences"); | 43 preferences_file_ = profile_dir.AppendASCII("Preferences"); |
| 44 user_scripts_dir_ = profile_dir.AppendASCII("User Scripts"); | 44 user_scripts_dir_ = profile_dir.AppendASCII("User Scripts"); |
| 45 extensions_dir_ = profile_dir.AppendASCII("Extensions"); | 45 extensions_dir_ = profile_dir.AppendASCII("Extensions"); |
| 46 | 46 |
| 47 if (enable_extensions_) { | 47 if (enable_extensions_) { |
| 48 command_line->AppendSwitch(switches::kEnableExtensions); | |
| 49 | |
| 50 FilePath src_dir; | 48 FilePath src_dir; |
| 51 PathService::Get(chrome::DIR_TEST_DATA, &src_dir); | 49 PathService::Get(chrome::DIR_TEST_DATA, &src_dir); |
| 52 src_dir = src_dir.AppendASCII("extensions").AppendASCII("good"); | 50 src_dir = src_dir.AppendASCII("extensions").AppendASCII("good"); |
| 53 | 51 |
| 54 file_util::CopyFile(src_dir.AppendASCII("Preferences"), | 52 file_util::CopyFile(src_dir.AppendASCII("Preferences"), |
| 55 preferences_file_); | 53 preferences_file_); |
| 56 file_util::CopyDirectory(src_dir.AppendASCII("Extensions"), | 54 file_util::CopyDirectory(src_dir.AppendASCII("Extensions"), |
| 57 profile_dir, true); // recursive | 55 profile_dir, true); // recursive |
| 56 } else { |
| 57 command_line->AppendSwitch(switches::kDisableExtensions); |
| 58 } | 58 } |
| 59 | 59 |
| 60 if (enable_user_scripts_) { | 60 if (enable_user_scripts_) { |
| 61 command_line->AppendSwitch(switches::kEnableUserScripts); | 61 command_line->AppendSwitch(switches::kEnableUserScripts); |
| 62 | 62 |
| 63 FilePath src_dir; | 63 FilePath src_dir; |
| 64 PathService::Get(chrome::DIR_TEST_DATA, &src_dir); | 64 PathService::Get(chrome::DIR_TEST_DATA, &src_dir); |
| 65 src_dir = src_dir.AppendASCII("extensions").AppendASCII("good") | 65 src_dir = src_dir.AppendASCII("extensions").AppendASCII("good") |
| 66 .AppendASCII("Extensions") | 66 .AppendASCII("Extensions") |
| 67 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") | 67 .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); | 225 ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); |
| 226 | 226 |
| 227 bool result = false; | 227 bool result = false; |
| 228 ui_test_utils::ExecuteJavaScriptAndExtractBool( | 228 ui_test_utils::ExecuteJavaScriptAndExtractBool( |
| 229 browser()->GetSelectedTabContents()->render_view_host(), L"", | 229 browser()->GetSelectedTabContents()->render_view_host(), L"", |
| 230 L"window.domAutomationController.send(document.title == 'Modified')", | 230 L"window.domAutomationController.send(document.title == 'Modified')", |
| 231 &result); | 231 &result); |
| 232 EXPECT_FALSE(result); | 232 EXPECT_FALSE(result); |
| 233 } | 233 } |
| OLD | NEW |