Add a preference to control Windows desktop search redirection.

components/search_engines/desktop_search_win_unittest.cc

 // Copyright 2015 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 "components/search_engines/detect_desktop_search_win.h"
+#include "components/search_engines/desktop_search_win.h"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/search_engines/testing_search_terms_data.h"
+#include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace {
 struct DetectWindowsDesktopSearchTestData {
   const char* url;
   const wchar_t* expected_search_terms;
 };
 }  // namespace
 
-TEST(DetectWindowsDesktopSearch, DetectWindowsDesktopSearch) {
+TEST(WindowsDesktopSearch, Prefs) {

[Peter Kasting, 2015/12/01 02:23:05]

This test seems pretty useless.  You're basically testing SetBoolean(), which is
plenty well tested elsewhere.  I'd remove this.

If you're going to test this, you'd want to test the code in
startup_browser_creator.cc that actually parses the input URLs and ensure it
respects these prefs appropriately.  (Testing that code is good anyway if it's
not already happening.)

This raises a question: should that code be responsible for checking the feature
and prefs here?  Or should those checks be internalized to
DetectWindowsDesktopSearch() itself?

[fdoray, 2015/12/02 17:28:27]

I've replaced GetWindowsDesktopSearchRedirectionPref with a function that checks
if both the feature and the pref are enabled. That way, there is less logic in
startup_browser_creator.cc.

Internalizing checks to DetectWindowsSearch() doesn't work, because in an
upcoming CL, I'll need to be able to detect Windows desktop searches even when
the feature is disabled, in order to log a UMA metric.

+  const char kWindowsDesktopSearchRedirectionPref[] =
+      "windows_desktop_search_redirection";
+
+  syncable_prefs::TestingPrefServiceSyncable prefs;
+  RegisterWindowsDesktopSearchRedirectionPref(prefs.registry());
+
+  EXPECT_EQ(WindowsDesktopSearchRedirectionPref::UNSET,
+            GetWindowsDesktopSearchRedirectionPref(&prefs));
+  prefs.SetBoolean(kWindowsDesktopSearchRedirectionPref, true);
+  EXPECT_EQ(WindowsDesktopSearchRedirectionPref::ENABLED,
+            GetWindowsDesktopSearchRedirectionPref(&prefs));
+  prefs.SetBoolean(kWindowsDesktopSearchRedirectionPref, false);
+  EXPECT_EQ(WindowsDesktopSearchRedirectionPref::DISABLED,
+            GetWindowsDesktopSearchRedirectionPref(&prefs));
+}
+
+TEST(WindowsDesktopSearch, DetectWindowsDesktopSearch) {
   const DetectWindowsDesktopSearchTestData test_data[] = {
       {"https://www.google.com", L""},
       {"https://www.bing.com/search", L""},
       {"https://www.bing.com/search?q=keyword&form=QBLH", L""},
       {"https://www.bing.com/search?q=keyword&form=WNSGPH", L"keyword"},
       {"https://www.bing.com/search?q=keyword&form=WNSBOX", L"keyword"},
       {"https://www.bing.com/search?q=keyword&FORM=WNSGPH", L"keyword"},
       {"https://www.bing.com/search?q=keyword&FORM=WNSBOX", L"keyword"},
       {"https://www.bing.com/search?form=WNSGPH&q=keyword", L"keyword"},
       {"https://www.bing.com/search?q=keyword&form=WNSGPH&other=stuff",
        L"keyword"},
       {"https://www.bing.com/search?q=%C3%A8+%C3%A9&form=WNSGPH", L"\xE8 \xE9"},
   };
 
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     TestingSearchTermsData search_terms_data("https://www.google.com");
     base::string16 search_terms;
     bool is_desktop_search = DetectWindowsDesktopSearch(
         GURL(test_data[i].url), search_terms_data, &search_terms);
     const base::string16 expected_search_terms(
         test_data[i].expected_search_terms);
     EXPECT_EQ(!expected_search_terms.empty(), is_desktop_search);
     EXPECT_EQ(expected_search_terms, search_terms);
   }
 }