Convert WindowOpenDisposition to an enum class.

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
@@ skipping 337 matching lines @@
   EXPECT_FALSE(AutocompleteMatch::IsSearchType(url_type_match.type));
   EXPECT_FALSE(prerenderer->IsAllowed(url_type_match, active_tab));
 }
 
 TEST_F(InstantSearchPrerendererTest, UsePrerenderPage) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Open a search results page. A prerendered page exists for |url|. Make sure
   // the browser swaps the current tab contents with the prerendered contents.
   GURL url("https://www.google.com/alt#quux=foo&strk");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+                                            WindowOpenDisposition::CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 TEST_F(InstantSearchPrerendererTest, PrerenderRequestCancelled) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Cancel the prerender request.
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   prerenderer->Cancel();
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 
   // Open a search results page. Prerendered page does not exists for |url|.
   // Make sure the browser navigates the current tab to this |url|.
   GURL url("https://www.google.com/alt#quux=foo&strk");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+                                            WindowOpenDisposition::CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
   EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(url, GetActiveWebContents()->GetURL());
 }
 
 TEST_F(InstantSearchPrerendererTest,
        UsePrerenderedPage_SearchQueryMistmatch) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Open a search results page. Committed query("pen") doesn't match with the
   // prerendered search query("foo"). Make sure the browser swaps the current
   // tab contents with the prerendered contents.
   GURL url("https://www.google.com/alt#quux=pen&strk");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+                                            WindowOpenDisposition::CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 TEST_F(InstantSearchPrerendererTest,
        CancelPrerenderRequest_EmptySearchQueryCommitted) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Open a search results page. Make sure the InstantSearchPrerenderer cancels
   // the active prerender request upon the receipt of empty search query.
   GURL url("https://www.google.com/alt#quux=&strk");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+                                            WindowOpenDisposition::CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
   EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(url, GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 TEST_F(InstantSearchPrerendererTest,
        CancelPrerenderRequest_UnsupportedDispositions) {
   PrerenderSearchQuery(ASCIIToUTF16("pen"));
 
   // Open a search results page. Make sure the InstantSearchPrerenderer cancels
   // the active prerender request for unsupported window dispositions.
   GURL url("https://www.google.com/alt#quux=pen&strk");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(
+      url, Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+      ui::PAGE_TRANSITION_TYPED, false));
   content::WebContents* new_tab =
       browser()->tab_strip_model()->GetWebContentsAt(1);
   EXPECT_NE(GetPrerenderURL(), new_tab->GetURL());
   EXPECT_EQ(url, new_tab->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 class ReuseInstantSearchBasePageTest : public InstantSearchPrerendererTest {
   public:
    ReuseInstantSearchBasePageTest() {}
@@ skipping 42 matching lines @@
 };
 
 TEST_F(TestUsePrerenderPage, ExtractSearchTermsAndUsePrerenderPage) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Open a search results page. Query extraction flag is disabled in field
   // trials. Search results page URL does not contain search terms replacement
   // key. Make sure UsePrerenderedPage() extracts the search terms from the URL
   // and uses the prerendered page contents.
   GURL url("https://www.google.com/alt#quux=foo");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED,
-                                            false));
+  browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+                                            WindowOpenDisposition::CURRENT_TAB,
+                                            ui::PAGE_TRANSITION_TYPED, false));
   EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 TEST_F(TestUsePrerenderPage, DoNotUsePrerenderPage) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
 
   // Do not use prerendered page for renderer initiated search request.
   GURL url("https://www.google.com/alt#quux=foo");
-  browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_LINK,
-                                            true  /* is_renderer_initiated */));
+  browser()->OpenURL(content::OpenURLParams(
+      url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+      ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */));
   EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }
 
 TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
   PrerenderSearchQuery(ASCIIToUTF16("foo"));
   EXPECT_TRUE(browser()->instant_controller());
 
   // Open a search results page. Query extraction flag is disabled in field
   // trials. Search results page URL does not contain search terms replacement
   // key.
   GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
-  browser()->instant_controller()->OpenInstant(CURRENT_TAB, url);
+  browser()->instant_controller()->OpenInstant(
+      WindowOpenDisposition::CURRENT_TAB, url);
   content::MockRenderProcessHost* process =
       static_cast<content::MockRenderProcessHost*>(
           prerender_contents()->GetRenderViewHost()->GetProcess());
   const IPC::Message* message = process->sink().GetFirstMessageMatching(
       ChromeViewMsg_SearchBoxSubmit::ID);
   ASSERT_TRUE(message);
 
   // Verify the IPC message params.
   std::tuple<base::string16, EmbeddedSearchRequestParams> params;
   ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
   EXPECT_EQ("foo", base::UTF16ToASCII(std::get<0>(params)));
   EXPECT_EQ("f", base::UTF16ToASCII(std::get<1>(params).original_query));
   EXPECT_EQ("utf-8", base::UTF16ToASCII(std::get<1>(params).input_encoding));
   EXPECT_EQ("", base::UTF16ToASCII(std::get<1>(params).rlz_parameter_value));
   EXPECT_EQ("chrome...0",
             base::UTF16ToASCII(std::get<1>(params).assisted_query_stats));
 }
 #endif