Register bindings for blessed web contexts (aka hosted app contexts) by hand

chrome/browser/extensions/extension_messages_apitest.cc

 // Copyright (c) 2012 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 "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 208 matching lines @@
         "onInstalled",
         "onSuspend",
         "onSuspendCanceled",
         "onUpdateAvailable",
         "onBrowserUpdateAvailable",
         "onConnect",
         "onConnectExternal",
         "onMessage",
         "onMessageExternal",
         "onRestartRequired",
-        "id",

[Jeffrey Yasskin, 2014/01/08 23:42:03]

Why is "id" dropping out of this list?

[not at google - send to devlin, 2014/01/09 00:56:16]

runtime.id is available to hosted apps, which fails this test. I am being lazy.

[Jeffrey Yasskin, 2014/01/09 01:30:00]

Please update the comment to admit that, so we're not confused in the future.

[not at google - send to devlin, 2014/01/09 18:06:48]

Done.

     };
 
     // Turn the array into a JS array, which effectively gets eval()ed.
     std::string as_js_array;
     for (size_t i = 0; i < arraysize(non_messaging_apis); ++i) {
       as_js_array += as_js_array.empty() ? "[" : ",";
       as_js_array += base::StringPrintf("'%s'", non_messaging_apis[i]);
     }
     as_js_array += "]";
 
@@ skipping 66 matching lines @@
             common_manifest()));
     CHECK(extension);
     return extension;
   }
 
   const Extension* LoadChromiumConnectableExtensionWithTlsChannelId() {
     return LoadExtensionIntoDir(&tls_channel_id_connectable_dir_,
                                 connectable_with_tls_channel_id_manifest());
   }
 
+  const Extension* LoadChromiumHostedApp() {
+    const Extension* hosted_app =
+        LoadExtensionIntoDir(&hosted_app_dir_, base::StringPrintf(
+            "{"
+            "  \"name\": \"chromium_hosted_app\","
+            "  \"version\": \"1.0\","
+            "  \"manifest_version\": 2,"
+            "  \"app\": {"
+            "    \"urls\": [\"%s\"],"
+            "    \"launch\": {"
+            "      \"web_url\": \"%s\""
+            "    }\n"
+            "  }\n"
+            "}", chromium_org_url().spec().c_str(),
+                 chromium_org_url().spec().c_str()));
+    CHECK(hosted_app);
+    return hosted_app;
+  }
+
   void InitializeTestServer() {
     base::FilePath test_data;
     EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data));
     embedded_test_server()->ServeFilesFromDirectory(test_data.AppendASCII(
         "extensions/api_test/messaging/externally_connectable/sites"));
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     host_resolver()->AddRule("*", embedded_test_server()->base_url().host());
   }
 
   const char* close_background_message() {
@@ skipping 59 matching lines @@
     CHECK(content::ExecuteScriptAndExtractString(
         browser()->tab_strip_model()->GetActiveWebContents(),
         base::StringPrintf("assertions.%s(%s)", method, args.c_str()),
         &result));
     return result;
   }
 
   TestExtensionDir web_connectable_dir_;
   TestExtensionDir not_connectable_dir_;
   TestExtensionDir tls_channel_id_connectable_dir_;
+  TestExtensionDir hosted_app_dir_;
 };
 
 IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, NotInstalled) {
   InitializeTestServer();
 
   const char kFakeId[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 
   ui_test_utils::NavigateToURL(browser(), chromium_org_url());
   EXPECT_EQ(NAMESPACE_NOT_DEFINED, CanConnectAndSendMessages(kFakeId));
   EXPECT_FALSE(AreAnyNonWebApisDefined());
@@ skipping 484 matching lines @@
   EXPECT_EQ("true",
       ExecuteScriptInBackgroundPage(sender->id(),
                                     base::StringPrintf(
           "chrome.test.runWithUserGesture(function() {\n"
           "  chrome.runtime.sendMessage('%s', {}, function(response)  {\n"
           "    window.domAutomationController.send('' + response.result);\n"
           "  });\n"
           "});", receiver->id().c_str())));
 }
 
+// Tests that a hosted app on a connectable site doesn't interfere with the
+// connectability of that site.
+IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, HostedAppOnWebsite) {
+  InitializeTestServer();
+
+  LoadChromiumHostedApp();
+
+  // The presence of the hosted app shouldn't give the ability to send messages.
+  ui_test_utils::NavigateToURL(browser(), chromium_org_url());
+  EXPECT_EQ(NAMESPACE_NOT_DEFINED, CanConnectAndSendMessages(""));
+  EXPECT_FALSE(AreAnyNonWebApisDefined());
+
+  // Once a connectable extension is installed, it should.
+  const Extension* extension = LoadChromiumConnectableExtension();
+  EXPECT_EQ(OK, CanConnectAndSendMessages(extension->id()));
+  EXPECT_FALSE(AreAnyNonWebApisDefined());
+}
+
 }  // namespace
 };  // namespace extensions