Move system.display tests to extensions/

extensions/browser/api_test_utils.cc

 // 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/browser/api_test_utils.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::ExtensionFunctionDispatcher;
 
 namespace {
@@ skipping 50 matching lines @@
     if (should_post_quit_) {
       base::MessageLoopForUI::current()->Quit();
     }
   }
 
  private:
   scoped_ptr<bool> response_;
   bool should_post_quit_;
 };
 
+scoped_refptr<extensions::Extension> CreateExtension(

[James Cook, 2014/12/19 18:07:03]

Can you move this out of the anonymous namespace and make the code in
chrome/browser/extensions/extension_function_utils.cc call this version? Then
there will be less duplicated code.

[tmpsantos, 2014/12/23 02:09:38]

Acknowledged.

+    extensions::Manifest::Location location,
+    base::DictionaryValue* test_extension_value,
+    const std::string& id_input) {
+  std::string error;
+  const base::FilePath test_extension_path;
+  std::string id;
+  if (!id_input.empty())
+    id = crx_file::id_util::GenerateId(id_input);
+  scoped_refptr<extensions::Extension> extension(extensions::Extension::Create(
+      test_extension_path, location, *test_extension_value,
+      extensions::Extension::NO_FLAGS, id, &error));
+  EXPECT_TRUE(error.empty()) << "Could not parse test extension " << error;
+  return extension;
+}
+
 }  // namespace
 
 namespace extensions {
 
 namespace api_test_utils {
 
+base::DictionaryValue* ParseDictionary(const std::string& data) {

[James Cook, 2014/12/19 18:07:03]

Likewise, can the extension_function_utils.cc versions just call these versions?

That's a strong signal to engineers touching //chrome that they really ought to
use these versions.

[tmpsantos, 2014/12/23 02:09:38]

Acknowledged.

+  base::Value* result = ParseJSON(data);
+  base::DictionaryValue* dict = NULL;
+  result->GetAsDictionary(&dict);
+  return dict;
+}
+
+bool GetBoolean(const base::DictionaryValue* val, const std::string& key) {
+  bool result = false;
+  if (!val->GetBoolean(key, &result))
+    ADD_FAILURE() << key << " does not exist or is not a boolean.";
+  return result;
+}
+
+int GetInteger(const base::DictionaryValue* val, const std::string& key) {
+  int result = 0;
+  if (!val->GetInteger(key, &result))
+    ADD_FAILURE() << key << " does not exist or is not an integer.";
+  return result;
+}
+
+std::string GetString(const base::DictionaryValue* val,
+                      const std::string& key) {
+  std::string result;
+  if (!val->GetString(key, &result))
+    ADD_FAILURE() << key << " does not exist or is not a string.";
+  return result;
+}
+
+scoped_refptr<Extension> CreateExtension(
+    base::DictionaryValue* test_extension_value) {
+  return ::CreateExtension(Manifest::INTERNAL, test_extension_value,
+                           std::string());
+}
+
 base::Value* RunFunctionWithDelegateAndReturnSingleResult(
     UIThreadExtensionFunction* function,
     const std::string& args,
     content::BrowserContext* context,
     scoped_ptr<extensions::ExtensionFunctionDispatcher> dispatcher) {
   return RunFunctionWithDelegateAndReturnSingleResult(
       function, args, context, dispatcher.Pass(), NONE);
 }
 
 base::Value* RunFunctionWithDelegateAndReturnSingleResult(
@@ skipping 100 matching lines @@
     response_delegate.set_should_post_quit(true);
     content::RunMessageLoop();
   }
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 }  // namespace api_test_utils
 }  // namespace extensions