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

Side by Side Diff: chrome_frame/test/automation_client_mock.cc

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/test/automation_client_mock.h" 5 #include "chrome_frame/test/automation_client_mock.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "chrome/common/automation_messages.h" 9 #include "chrome/common/automation_messages.h"
10 #include "chrome_frame/custom_sync_call_context.h" 10 #include "chrome_frame/custom_sync_call_context.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 scoped_refptr<ChromeFrameAutomationClient> client_; 116 scoped_refptr<ChromeFrameAutomationClient> client_;
117 scoped_refptr<ChromeFrameLaunchParams> launch_params_; 117 scoped_refptr<ChromeFrameLaunchParams> launch_params_;
118 chrome_frame_test::TimedMsgLoop loop_; 118 chrome_frame_test::TimedMsgLoop loop_;
119 }; 119 };
120 120
121 // static 121 // static
122 FilePath CFACWithChrome::profile_path_; 122 FilePath CFACWithChrome::profile_path_;
123 123
124 // static 124 // static
125 void CFACWithChrome::SetUpTestCase() { 125 void CFACWithChrome::SetUpTestCase() {
126 profile_path_ = chrome_frame_test::GetProfilePath(L"Adam.N.Epilinter"); 126 GetChromeFrameProfilePath(&profile_path_, L"Adam.N.Epilinter");
robertshield 2012/05/02 20:05:13 I'm confused, the prototype is: // Sets |profile_p
Jói 2012/05/03 11:41:52 Whoops, forgot to upload latest. Uploaded now.
127 } 127 }
128 128
129 // static 129 // static
130 void CFACWithChrome::TearDownTestCase() { 130 void CFACWithChrome::TearDownTestCase() {
131 profile_path_.clear(); 131 profile_path_.clear();
132 } 132 }
133 133
134 void CFACWithChrome::SetUp() { 134 void CFACWithChrome::SetUp() {
135 chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path_.value()); 135 chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path_.value());
136 client_ = new ChromeFrameAutomationClient(); 136 client_ = new ChromeFrameAutomationClient();
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 GURL("http://www.nonexistent.com"), empty, profile_path_, 463 GURL("http://www.nonexistent.com"), empty, profile_path_,
464 profile_path_.BaseName().value(), L"", false, false, false, false)); 464 profile_path_.BaseName().value(), L"", false, false, false, false));
465 launch_params->set_launch_timeout(timeout); 465 launch_params->set_launch_timeout(timeout);
466 launch_params->set_version_check(false); 466 launch_params->set_version_check(false);
467 EXPECT_TRUE(client_->Initialize(&cfd_, launch_params)); 467 EXPECT_TRUE(client_->Initialize(&cfd_, launch_params));
468 loop_.RunFor(base::TimeDelta::FromSeconds(10)); 468 loop_.RunFor(base::TimeDelta::FromSeconds(10));
469 469
470 EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1); 470 EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
471 client_->Uninitialize(); 471 client_->Uninitialize();
472 } 472 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698