Added extensions API to provide customization values.

This CL adds API that could be used only by component extensions.
Currently, API only returns device's HWID.

BUG=chromium-os:13076
TEST=browser_tests

Review URL: http://codereview.chromium.org/6681038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79264 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 15 deletions

diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index bebf457..a3e10aa 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -100,26 +100,30 @@ void ExtensionApiTest::TearDownInProcessBrowserTestFixture() {
 }
 
 bool ExtensionApiTest::RunExtensionTest(const char* extension_name) {
-  return RunExtensionTestImpl(extension_name, "", false, true);
+  return RunExtensionTestImpl(extension_name, "", false, true, false);
 }
 
 bool ExtensionApiTest::RunExtensionTestIncognito(const char* extension_name) {
-  return RunExtensionTestImpl(extension_name, "", true, true);
+  return RunExtensionTestImpl(extension_name, "", true, true, false);
+}
+
+bool ExtensionApiTest::RunComponentExtensionTest(const char* extension_name) {
+  return RunExtensionTestImpl(extension_name, "", false, true, true);
 }
 
 bool ExtensionApiTest::RunExtensionTestNoFileAccess(
     const char* extension_name) {
-  return RunExtensionTestImpl(extension_name, "", false, false);
+  return RunExtensionTestImpl(extension_name, "", false, false, false);
 }
 
 bool ExtensionApiTest::RunExtensionTestIncognitoNoFileAccess(
     const char* extension_name) {
-  return RunExtensionTestImpl(extension_name, "", true, false);
+  return RunExtensionTestImpl(extension_name, "", true, false, false);
 }
 bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
                                            const std::string& page_url) {
   DCHECK(!page_url.empty()) << "Argument page_url is required.";
-  return RunExtensionTestImpl(extension_name, page_url, false, true);
+  return RunExtensionTestImpl(extension_name, page_url, false, true, false);
 }
 
 bool ExtensionApiTest::RunPageTest(const std::string& page_url) {
@@ -131,22 +135,28 @@ bool ExtensionApiTest::RunPageTest(const std::string& page_url) {
 bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name,
                                             const std::string& page_url,
                                             bool enable_incognito,
-                                            bool enable_fileaccess) {
+                                            bool enable_fileaccess,
+                                            bool load_as_component) {
   ResultCatcher catcher;
   DCHECK(!std::string(extension_name).empty() || !page_url.empty()) <<
       "extension_name and page_url cannot both be empty";
 
   if (!std::string(extension_name).empty()) {
-    bool loaded;
-    if (enable_incognito) {
-      loaded = enable_fileaccess ?
-        LoadExtensionIncognito(test_data_dir_.AppendASCII(extension_name)) :
-        LoadExtensionIncognitoNoFileAccess(
-            test_data_dir_.AppendASCII(extension_name));
+    bool loaded = false;
+    if (load_as_component) {
+      loaded =
+          LoadExtensionAsComponent(test_data_dir_.AppendASCII(extension_name));
     } else {
-      loaded = enable_fileaccess ?
-        LoadExtension(test_data_dir_.AppendASCII(extension_name)) :
-        LoadExtensionNoFileAccess(test_data_dir_.AppendASCII(extension_name));
+      if (enable_incognito) {
+        loaded = enable_fileaccess ?
+          LoadExtensionIncognito(test_data_dir_.AppendASCII(extension_name)) :
+          LoadExtensionIncognitoNoFileAccess(
+              test_data_dir_.AppendASCII(extension_name));
+      } else {
+        loaded = enable_fileaccess ?
+          LoadExtension(test_data_dir_.AppendASCII(extension_name)) :
+          LoadExtensionNoFileAccess(test_data_dir_.AppendASCII(extension_name));
+      }
     }
     if (!loaded) {
       message_ = "Failed to load extension.";