diff options
| -rw-r--r-- | base/test_file_util_posix.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | chrome/test/startup/feature_startup_test.cc | 13 |
4 files changed, 9 insertions, 16 deletions
diff --git a/base/test_file_util_posix.cc b/base/test_file_util_posix.cc index 38aaae2..ce36091 100644 --- a/base/test_file_util_posix.cc +++ b/base/test_file_util_posix.cc @@ -63,8 +63,7 @@ bool CopyRecursiveDirNoCache(const std::wstring& source_dir, errno = 0; FilePath source_path(ent->fts_path); if (CopyFile(source_path, target_path)) { - bool success = EvictFileFromSystemCache( - target_path.Append(source_path.BaseName())); + bool success = EvictFileFromSystemCache(target_path); DCHECK(success); } else { error = errno ? errno : EINVAL; diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 3e0fba0..8a9be0d 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -865,8 +865,10 @@ AutomationProvider::AutomationProvider(Profile* profile) #if defined(OS_WIN) // TODO(port): Enable as the trackers get ported. cwindow_tracker_.reset(new AutomationConstrainedWindowTracker(this)); +#else + NOTIMPLEMENTED() << "hook up constrained window tracker"; +#endif new_tab_ui_load_observer_.reset(new NewTabUILoadObserver(this)); -#endif // defined(OS_WIN) dom_operation_observer_.reset(new DomOperationNotificationObserver(this)); dom_inspector_observer_.reset(new DomInspectorNotificationObserver(this)); } diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 62fcef7..b313b83 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2903,11 +2903,6 @@ '../build/linux/system.gyp:gtk', ], }], - ['OS!="win"', { - 'sources!': [ - 'test/startup/feature_startup_test.cc', - ], - }], ], }, { diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc index b1a22f4..2d86b4b 100644 --- a/chrome/test/startup/feature_startup_test.cc +++ b/chrome/test/startup/feature_startup_test.cc @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <windows.h> - -#include "app/win_util.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/perftimer.h" @@ -21,12 +18,12 @@ namespace { // Returns the directory name where the "typical" user data is that we use for // testing. -std::wstring ComputeTypicalUserDataSource() { - std::wstring source_history_file; +FilePath ComputeTypicalUserDataSource() { + FilePath source_history_file; EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_history_file)); - file_util::AppendToPath(&source_history_file, L"profiles"); - file_util::AppendToPath(&source_history_file, L"typical_history"); + source_history_file = source_history_file.AppendASCII("profiles") + .AppendASCII("typical_history"); return source_history_file; } @@ -54,7 +51,7 @@ class NewTabUIStartupTest : public UITest { // we should report cold timings. void RunStartupTest(const char* label, bool want_warm, bool important) { // Install the location of the test profile file. - set_template_user_data(ComputeTypicalUserDataSource()); + set_template_user_data(ComputeTypicalUserDataSource().ToWStringHack()); TimeDelta timings[kNumCycles]; for (int i = 0; i < kNumCycles; ++i) { |