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

Side by Side Diff: extensions/shell/test/shell_apitest.cc

Issue 529293003: Extract ResultCatcher from ExtensionApiTest. Use it in ShellApiTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 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
OLDNEW
(Empty)
1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "extensions/shell/test/shell_apitest.h"
6
7 #include "base/files/file_path.h"
8 #include "base/path_service.h"
9 #include "extensions/common/extension_paths.h"
10 #include "extensions/shell/browser/shell_extension_system.h"
11 #include "extensions/test/result_catcher.h"
12
13 namespace extensions {
14
15 ShellApiTest::ShellApiTest() {
16 }
17
18 ShellApiTest::~ShellApiTest() {
19 }
20
21 bool ShellApiTest::RunAppTest(const std::string& app_dir) {
22 base::FilePath test_data_dir;
23 PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir);
24 test_data_dir = test_data_dir.AppendASCII(app_dir);
25 ResultCatcher catcher;
26
27 bool loaded = extension_system_->LoadApp(test_data_dir);
28 if (loaded)
29 extension_system_->LaunchApp();
30 else
31 return false;
James Cook 2014/09/03 18:08:41 nit: maybe clearer as: if (!loaded) return fals
Yoyo Zhou 2014/09/04 21:57:42 Done.
32
33 if (!catcher.GetNextResult()) {
34 message_ = catcher.message();
35 return false;
36 }
37
38 return true;
39 }
40
41 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698