Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / search / search_unittest.cc

diff --git a/src/chrome/browser/search/search_unittest.cc b/src/chrome/browser/search/search_unittest.cc
index ad923b4..7a4187f 100644 (file)
--- a/src/chrome/browser/search/search_unittest.cc
+++ b/src/chrome/browser/search/search_unittest.cc
@@ -13,9 +13,6 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
-#include "chrome/browser/supervised_user/supervised_user_service.h"
-#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
-#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -34,11 +31,17 @@
 #include "content/public/common/renderer_preferences.h"
 #include "url/gurl.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_url_filter.h"
+#endif
+
 namespace chrome {
 
 class SearchTest : public BrowserWithTestWindowTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     field_trial_list_.reset(new base::FieldTrialList(
         new metrics::SHA1EntropyProvider("42")));
@@ -431,6 +434,7 @@ TEST_F(SearchTest, UseLocalNTPIfNTPURLIsNotSet) {
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url);
 }
 
+#if defined(ENABLE_MANAGED_USERS)
 TEST_F(SearchTest, UseLocalNTPIfNTPURLIsBlockedForSupervisedUser) {
   // Block access to foo.com in the URL filter.
   SupervisedUserService* supervised_user_service =
@@ -448,6 +452,7 @@ TEST_F(SearchTest, UseLocalNTPIfNTPURLIsBlockedForSupervisedUser) {
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url);
   EXPECT_EQ(GURL(), GetInstantURL(profile(), false));
 }
+#endif
 
 TEST_F(SearchTest, GetInstantURL) {
   // No Instant URL because "strk" is missing.
@@ -754,8 +759,7 @@ TEST_F(SearchTest, IsQueryExtractionAllowedForURL) {
 
 class SearchURLTest : public SearchTest {
  protected:
-  virtual void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url)
-      OVERRIDE {
+  void SetSearchProvider(bool set_ntp_url, bool insecure_ntp_url) override {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(profile());
     TemplateURLData data;