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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: extensions/shell/test/shell_apitest.cc
diff --git a/extensions/shell/test/shell_apitest.cc b/extensions/shell/test/shell_apitest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c1311d0e854e21e9595af23352ccc87b3e772be2
--- /dev/null
+++ b/extensions/shell/test/shell_apitest.cc
@@ -0,0 +1,41 @@
+// Copyright 2014 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.
+
+#include "extensions/shell/test/shell_apitest.h"
+
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "extensions/common/extension_paths.h"
+#include "extensions/shell/browser/shell_extension_system.h"
+#include "extensions/test/result_catcher.h"
+
+namespace extensions {
+
+ShellApiTest::ShellApiTest() {
+}
+
+ShellApiTest::~ShellApiTest() {
+}
+
+bool ShellApiTest::RunAppTest(const std::string& app_dir) {
+ base::FilePath test_data_dir;
+ PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir);
+ test_data_dir = test_data_dir.AppendASCII(app_dir);
+ ResultCatcher catcher;
+
+ bool loaded = extension_system_->LoadApp(test_data_dir);
+ if (loaded)
+ extension_system_->LaunchApp();
+ else
+ 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.
+
+ if (!catcher.GetNextResult()) {
+ message_ = catcher.message();
+ return false;
+ }
+
+ return true;
+}
+
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698