[Extensions] Expand testing overrides for extension warning bubbles

[Extensions] Expand testing overrides for extension warning bubbles

Expand the testing override for the extension warning bubbles from just forcing
enabled to also forcing disabled. As we roll this out on finch, it will begin
becoming the default on trybots, but we don't want to have these bubbles
interfering with our tests when we load unpacked extensions (which is in almost
all extension browser tests).

TBR=avi@chromium.org (micro changes to permission bubble test)
TBR=mmenke@chromium.org (micro changes to prerender test)

Committed: https://crrev.com/85779db494670b7797bc774ac375067665f2ad89
Cr-Commit-Position: refs/heads/master@{#342402}

[Devlin, 2015-08-05 21:35:11]

rdevlin.cronin@chromium.org changed reviewers:
+ asargent@chromium.org

[Devlin, 2015-08-05 21:35:12]

Antony, mind taking a quick look?

[asargent_no_longer_on_chrome, 2015-08-05 22:35:04]

lgtm, but I noticed some trybot failures which, when I looked at them, lead to a
"ZOMG!" realization that PermissionBubbleAppBrowserTest double-inherits from
ExtensionBrowserTest. That's ... pretty messed up.

[asargent_no_longer_on_chrome, 2015-08-05 22:36:05]

On 2015/08/05 22:35:04, Antony Sargent wrote:
> lgtm, but I noticed some trybot failures which, when I looked at them, lead to
a
> "ZOMG!" realization that PermissionBubbleAppBrowserTest double-inherits from
> ExtensionBrowserTest. That's ... pretty messed up.

To be clear, I mean that PermissionBubbleAppBrowserTest is messed up, not any of
your changes.

[Devlin, 2015-08-05 23:06:40]

On 2015/08/05 22:36:05, Antony Sargent wrote:
> On 2015/08/05 22:35:04, Antony Sargent wrote:
> > lgtm, but I noticed some trybot failures which, when I looked at them, lead
to
> a
> > "ZOMG!" realization that PermissionBubbleAppBrowserTest double-inherits from
> > ExtensionBrowserTest. That's ... pretty messed up.
> 
> To be clear, I mean that PermissionBubbleAppBrowserTest is messed up, not any
of
> your changes.

I noticed that, too (cursed diamond inheritance!).  Fixed.

[Devlin, 2015-08-05 23:07:09]

rdevlin.cronin@chromium.org changed reviewers:
+ felt@chromium.org

[Devlin, 2015-08-05 23:07:09]

Adrienne, mind reviewing the website_settings diamond inheritance fix?  (As a
bonus, it also cleans up about 50 lines of code :))

[felt, 2015-08-06 16:32:05]

On 2015/08/05 23:07:09, Devlin wrote:
> Adrienne, mind reviewing the website_settings diamond inheritance fix?  (As a
> bonus, it also cleans up about 50 lines of code :))

I think the reason for this was to avoid needing to bring up an extension for
any test that uses the testing class, but you're right that this is a lot
cleaner/simpler. lgtm

[Devlin, 2015-08-06 17:30:35]

On 2015/08/06 16:32:05, felt wrote:
> On 2015/08/05 23:07:09, Devlin wrote:
> > Adrienne, mind reviewing the website_settings diamond inheritance fix?  (As
a
> > bonus, it also cleans up about 50 lines of code :))
> 
> I think the reason for this was to avoid needing to bring up an extension for
> any test that uses the testing class, but you're right that this is a lot
> cleaner/simpler. lgtm

It won't bring up the extension now, even - the extension is only loaded if
OpenExtensionAppWindow() is called.

[Devlin, 2015-08-06 17:30:38]

The CQ bit was checked by rdevlin.cronin@chromium.org

[Devlin, 2015-08-06 17:30:38]

The patchset sent to the CQ was uploaded after l-g-t-m from
asargent@chromium.org
Link to the patchset: https://codereview.chromium.org/1275623004/#ps20001
(title: "Fix diamond inheritance")

[commit-bot: I haz the power, 2015-08-06 17:31:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/20001

[commit-bot: I haz the power, 2015-08-06 17:45:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-06 17:45:12]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[Devlin, 2015-08-06 17:50:57]

The CQ bit was checked by rdevlin.cronin@chromium.org

[commit-bot: I haz the power, 2015-08-06 17:51:25]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/20001

[commit-bot: I haz the power, 2015-08-06 18:26:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-06 18:26:13]

Try jobs failed on following builders:
  win_chromium_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[Devlin, 2015-08-06 19:31:03]

The CQ bit was checked by rdevlin.cronin@chromium.org

[Devlin, 2015-08-06 19:31:08]

The patchset sent to the CQ was uploaded after l-g-t-m from
asargent@chromium.org, felt@chromium.org
Link to the patchset: https://codereview.chromium.org/1275623004/#ps40001
(title: " ")

[commit-bot: I haz the power, 2015-08-06 19:31:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/40001

[commit-bot: I haz the power, 2015-08-06 19:34:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-06 19:34:32]

Try jobs failed on following builders:
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Devlin, 2015-08-06 23:53:32]

The CQ bit was checked by rdevlin.cronin@chromium.org

[Devlin, 2015-08-06 23:53:33]

The patchset sent to the CQ was uploaded after l-g-t-m from
asargent@chromium.org, felt@chromium.org
Link to the patchset: https://codereview.chromium.org/1275623004/#ps60001
(title: "Rebase")

[commit-bot: I haz the power, 2015-08-06 23:55:05]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/60001

[commit-bot: I haz the power, 2015-08-07 00:44:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-07 00:44:38]

Try jobs failed on following builders:
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Devlin, 2015-08-07 01:29:23]

The CQ bit was checked by rdevlin.cronin@chromium.org

[commit-bot: I haz the power, 2015-08-07 01:32:01]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/60001

[commit-bot: I haz the power, 2015-08-07 02:15:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-07 02:15:21]

Failed to apply patch for chrome/browser/extensions/extension_browsertest.cc:
While running git apply --index -3 -p1;
  error: patch failed: chrome/browser/extensions/extension_browsertest.cc:30
  Falling back to three-way merge...
  Applied patch to 'chrome/browser/extensions/extension_browsertest.cc' with
conflicts.
  U chrome/browser/extensions/extension_browsertest.cc

Patch:       chrome/browser/extensions/extension_browsertest.cc
Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc
b/chrome/browser/extensions/extension_browsertest.cc
index
2f29b806f3f4800394f90fa2865e66d8f4ba2e29..9a8a2667321a87d27a05699e0f9baa7aebb76835
100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -121,6 +122,10 @@ void
ExtensionBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
   test_data_dir_ = test_data_dir_.AppendASCII("extensions");
   observer_.reset(new ExtensionTestNotificationObserver(browser()));
 
+  // We don't want any warning bubbles for, e.g., unpacked extensions.
+  ExtensionMessageBubbleFactory::set_override_for_tests(
+      ExtensionMessageBubbleFactory::OVERRIDE_DISABLED);
+
 #if defined(OS_CHROMEOS)
   if (set_chromeos_user_) {
     // This makes sure that we create the Default profile first, with no
@@ -142,6 +147,12 @@ void ExtensionBrowserTest::SetUpOnMainThread() {
   }
 }
 
+void ExtensionBrowserTest::TearDownOnMainThread() {
+  ExtensionMessageBubbleFactory::set_override_for_tests(
+      ExtensionMessageBubbleFactory::NO_OVERRIDE);
+  InProcessBrowserTest::TearDownOnMainThread();
+}
+
 const Extension* ExtensionBrowserTest::LoadExtension(
     const base::FilePath& path) {
   return LoadExtensionWithFlags(path, kFlagEnableFileAccess);

[commit-bot: I haz the power, 2015-08-07 02:16:50]

The CQ bit was unchecked by commit-bot@chromium.org

[Devlin, 2015-08-07 17:21:23]

The CQ bit was checked by rdevlin.cronin@chromium.org

[Devlin, 2015-08-07 17:21:23]

The patchset sent to the CQ was uploaded after l-g-t-m from
asargent@chromium.org, felt@chromium.org
Link to the patchset: https://codereview.chromium.org/1275623004/#ps80001
(title: "Rebase")

[commit-bot: I haz the power, 2015-08-07 17:21:38]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1275623004/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1275623004/80001

[commit-bot: I haz the power, 2015-08-07 19:15:00]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-08-07 19:15:34]

Patchset 5 (id:??) landed as
https://crrev.com/85779db494670b7797bc774ac375067665f2ad89
Cr-Commit-Position: refs/heads/master@{#342402}