Merge pull request #1317 from brave/hangouts-disable

Only run tests for hangouts when it is enabled
brave · Jan 14, 2019 · f5a7698 · f5a7698
2 parents 2bef5ea + d30141a
commit f5a7698
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/buildflags.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -301,6 +302,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
       << "No changes on the real URL";
 }
 
+#if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
 IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
                        HangoutsEnabledByDefault) {
   ASSERT_TRUE(browser()->profile()->GetPrefs()->GetBoolean(kHangoutsEnabled));
@@ -321,6 +323,7 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest,
       extensions::ExtensionRegistry::Get(browser()->profile());
   ASSERT_FALSE(registry->enabled_extensions().Contains(hangouts_extension_id));
 }
+#endif
 
 class BraveContentBrowserClientReferrerTest
     : public BraveContentBrowserClientTest {

diff --git a/browser/extensions/brave_component_loader.h b/browser/extensions/brave_component_loader.h
@@ -34,6 +34,8 @@ class BraveComponentLoader : public ComponentLoader {
     const std::string& manifest);
   void AddExtension(const std::string& id,
       const std::string& name, const std::string& public_key);
+  // ForceAddHangoutServicesExtension ignores whether or not a preference for
+  // hangouts is set.  If the buildflag is not set, it won't add though.
   void ForceAddHangoutServicesExtension();
 
   static bool IsPdfjsDisabled();