Block content scripts from executing until user grants permission

chrome/browser/extensions/active_script_controller_browsertest.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 "base/macros.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
@@ skipping 132 matching lines @@
   // If the extension has permission, we should be able to simply wait for it
   // to execute.
   if (!requires_consent_) {
     inject_success_listener_->WaitUntilSatisfied();
     return testing::AssertionSuccess();
   }
 
   // Otherwise, we don't have permission, and have to grant it. Ensure the
   // script has *not* already executed.
   // Currently, it's okay for content scripts to execute, because we don't
   // block them.

[not at google - send to devlin, 2014/05/15 00:31:54]

comment needs updating?

[Devlin, 2014/05/20 16:48:09]

Whoops, thanks.

-  // TODO(rdevlin.cronin): Fix this.
-  if (inject_success_listener_->was_satisfied() && type_ != CONTENT_SCRIPT) {
+  if (inject_success_listener_->was_satisfied()) {
     return testing::AssertionFailure() <<
         name_ << "'s script ran without permission.";
   }
 
   ExtensionAction* action = controller->GetActionForExtension(extension_);
   // We've already verified this exists, so just a sanity check.
   DCHECK(action);
 
   // Grant permission by clicking on the extension action.
   location_bar_controller->OnClicked(action);
@@ skipping 58 matching lines @@
   // inject the script.
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));
 
   for (size_t i = 0u; i < arraysize(testers); ++i)
     EXPECT_TRUE(testers[i].Verify(browser())) << kExtensionNames[i];
 }
 
 }  // namespace extensions