Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3267)

Unified Diff: chrome_frame/test/automation_client_mock.h

Issue 10197011: Share the "get CF profile dir" code between ChromeFramePlugin and chrome_frame_test_utils.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_plugin.h ('k') | chrome_frame/test/automation_client_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/automation_client_mock.h
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 986d56a0dc121e2ce0200431e8673278ae29abec..4cd89dcbff431899ab10f658fe3586bd07858e8d 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,6 +12,7 @@
#include "chrome_frame/chrome_frame_automation.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/proxy_factory_mock.h"
+#include "chrome_frame/utils.h"
#include "gmock/gmock.h"
using testing::StrictMock;
@@ -169,9 +170,8 @@ class CFACMockTest : public testing::Test {
protected:
CFACMockTest()
: tracker_(NULL), timeout_(500),
- returned_proxy_(static_cast<ChromeFrameAutomationProxy*>(&mock_proxy_)),
- profile_path_(
- chrome_frame_test::GetProfilePath(L"Adam.N.Epilinter")) {
+ returned_proxy_(static_cast<ChromeFrameAutomationProxy*>(&mock_proxy_)) {
+ GetChromeFrameProfilePath(L"Adam.N.Epilinter", &profile_path_);
id_ = reinterpret_cast<void*>(5);
tab_handle_ = 3;
}
« no previous file with comments | « chrome_frame/chrome_frame_plugin.h ('k') | chrome_frame/test/automation_client_mock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698