Componentize google_util

chrome/browser/google/google_url_tracker_unittest.cc

 // Copyright 2012 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/google/core/browser/google_url_tracker.h"
 
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
-#include "chrome/browser/google/google_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/google/core/browser/google_pref_names.h"
 #include "components/google/core/browser/google_url_tracker_client.h"
 #include "components/google/core/browser/google_url_tracker_infobar_delegate.h"
 #include "components/google/core/browser/google_url_tracker_navigation_helper.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 48 matching lines @@
 class TestGoogleURLTrackerClient : public GoogleURLTrackerClient {
  public:
   TestGoogleURLTrackerClient(Profile* profile_);
   virtual ~TestGoogleURLTrackerClient();
 
   virtual void SetListeningForNavigationStart(bool listen) OVERRIDE;
   virtual bool IsListeningForNavigationStart() OVERRIDE;
   virtual bool IsBackgroundNetworkingEnabled() OVERRIDE;
   virtual PrefService* GetPrefs() OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
-  virtual bool IsGoogleDomainURL(const GURL& url) OVERRIDE;
 
  private:
   Profile* profile_;
   bool observe_nav_start_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGoogleURLTrackerClient);
 };
 
 TestGoogleURLTrackerClient::TestGoogleURLTrackerClient(Profile* profile)
     : profile_(profile),
@@ skipping 16 matching lines @@
 }
 
 PrefService* TestGoogleURLTrackerClient::GetPrefs() {
   return profile_->GetPrefs();
 }
 
 net::URLRequestContextGetter* TestGoogleURLTrackerClient::GetRequestContext() {
   return profile_->GetRequestContext();
 }
 
-bool TestGoogleURLTrackerClient::IsGoogleDomainURL(const GURL& url) {
-  return google_util::IsGoogleDomainUrl(
-      url,
-      google_util::DISALLOW_SUBDOMAIN,
-      google_util::DISALLOW_NON_STANDARD_PORTS);
-}
-
 
 // TestGoogleURLTrackerNavigationHelper ---------------------------------------
 
 class TestGoogleURLTrackerNavigationHelper
     : public GoogleURLTrackerNavigationHelper {
  public:
   explicit TestGoogleURLTrackerNavigationHelper(GoogleURLTracker* tracker);
   virtual ~TestGoogleURLTrackerNavigationHelper();
 
   virtual void SetListeningForNavigationCommit(bool listen) OVERRIDE;
@@ skipping 911 matching lines @@
   EXPECT_FALSE(GetInfoBarDelegate(&infobar_manager) == NULL);
   GoogleURLTrackerInfoBarDelegate* delegate2 =
       GetInfoBarDelegate(&infobar_manager2);
   ASSERT_FALSE(delegate2 == NULL);
   SetNavigationPending(&infobar_manager, true);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(&infobar_manager, true));
   delegate2->Close(false);
   SetNavigationPending(&infobar_manager, false);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(&infobar_manager, false));
 }