Partially componentize //chrome/browser/search/search.{h,cc}

chrome/browser/ui/search/new_tab_page_interceptor_service.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 "chrome/browser/ui/search/new_tab_page_interceptor_service.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 59 matching lines @@
 
     // Request to NTP was successful.
     if (request->status().is_success() &&
         request->GetResponseCode() != net::HTTP_NO_CONTENT &&
         request->GetResponseCode() < 400) {
       return nullptr;
     }
 
     // Failure to load the NTP correctly; redirect to Local NTP.
     UMA_HISTOGRAM_ENUMERATION("InstantExtended.CacheableNTPLoad",
-                              chrome::CACHEABLE_NTP_LOAD_FAILED,
-                              chrome::CACHEABLE_NTP_LOAD_MAX);
+                              search::CACHEABLE_NTP_LOAD_FAILED,
+                              search::CACHEABLE_NTP_LOAD_MAX);
     return new net::URLRequestRedirectJob(
         request, network_delegate, GURL(chrome::kChromeSearchLocalNtpUrl),
         net::URLRequestRedirectJob::REDIRECT_307_TEMPORARY_REDIRECT,
         "NTP Request Interceptor");
   }
 
   GURL new_tab_url_;
   base::WeakPtrFactory<NewTabPageInterceptor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NewTabPageInterceptor);
 };
 
 NewTabPageInterceptorService::NewTabPageInterceptorService(Profile* profile)
     : profile_(profile),
       template_url_service_(TemplateURLServiceFactory::GetForProfile(profile)) {
   DCHECK(profile_);
   if (template_url_service_)
     template_url_service_->AddObserver(this);
 }
 
 NewTabPageInterceptorService::~NewTabPageInterceptorService() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 }
 
 void NewTabPageInterceptorService::OnTemplateURLServiceChanged() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  GURL new_tab_page_url(chrome::GetNewTabPageURL(profile_));
+  GURL new_tab_page_url(search::GetNewTabPageURL(profile_));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&NewTabPageInterceptor::SetNewTabPageURL, interceptor_,
                  new_tab_page_url));
 }
 
 scoped_ptr<net::URLRequestInterceptor>
 NewTabPageInterceptorService::CreateInterceptor() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   scoped_ptr<NewTabPageInterceptor> interceptor(
-      new NewTabPageInterceptor(chrome::GetNewTabPageURL(profile_)));
+      new NewTabPageInterceptor(search::GetNewTabPageURL(profile_)));
   interceptor_ = interceptor->GetWeakPtr();
   return interceptor.Pass();
 }