Add ManagedUserService for profile-specific managed user data.

chrome/browser/managed_mode/managed_mode_navigation_observer.cc

 // Copyright (c) 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 "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 197 matching lines @@
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagedModeNavigationObserver);
 
 ManagedModeNavigationObserver::~ManagedModeNavigationObserver() {
   RemoveTemporaryException();
 }
 
 ManagedModeNavigationObserver::ManagedModeNavigationObserver(
     content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
-      url_filter_(ManagedMode::GetURLFilterForUIThread()),
       warn_infobar_delegate_(NULL),
       preview_infobar_delegate_(NULL),
       state_(RECORDING_URLS_BEFORE_PREVIEW),
-      last_allowed_page_(-1) {}
+      last_allowed_page_(-1) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  managed_user_service_ = ManagedUserServiceFactory::GetForProfile(profile);
+  url_filter_ = managed_user_service_->GetURLFilterForUIThread();
+}
 
 void ManagedModeNavigationObserver::AddTemporaryException() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(web_contents());
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ManagedModeResourceThrottle::AddTemporaryException,
                  web_contents()->GetRenderProcessHost()->GetID(),
@@ skipping 33 matching lines @@
        ++it) {
     whitelist.AppendString(it->scheme() + "://." + it->host() + it->path());
   }
   if (last_url_.is_valid()) {
     if (last_url_.SchemeIs("https")) {
       whitelist.AppendString("https://" + last_url_.host());
     } else {
       whitelist.AppendString(last_url_.host());
     }
   }
-  ManagedMode::AddToManualList(true, whitelist);
+  managed_user_service_->AddToManualList(true, whitelist);
   ClearObserverState();
 }
 
 void ManagedModeNavigationObserver::AddURLToPatternList(const GURL& url) {
   DCHECK(state_ != NOT_RECORDING_URLS);
   navigated_urls_.insert(url);
 }
 
 void ManagedModeNavigationObserver::AddURLAsLastPattern(const GURL& url) {
   DCHECK(state_ != NOT_RECORDING_URLS);
@@ skipping 76 matching lines @@
     // A temporary exception should be added only if an interstitial was shown,
     // the user clicked preview and the final page was not allowed. This
     // temporary exception stops the interstitial from showing on further
     // navigations to that host so that the user can navigate around to
     // inspect it.
     state_ = NOT_RECORDING_URLS;
     AddTemporaryException();
   }
 }
 
-void ManagedModeNavigationObserver::DidStartProvisionalLoadForFrame(
-    int64 frame_id,
-    int64 parent_frame_id,
-    bool is_main_frame,
-    const GURL& validated_url,
-    bool is_error_page,
-    bool is_iframe_srcdoc,
-    content::RenderViewHost* render_view_host) {
-  if (!is_main_frame)
-    return;
-}
-
 void ManagedModeNavigationObserver::ProvisionalChangeToMainFrameUrl(
     const GURL& url,
     content::RenderViewHost* render_view_host) {
   // This function is the last one to be called before the resource throttle
   // shows the interstitial if the URL must be blocked.
   ManagedModeURLFilter::FilteringBehavior behavior =
       url_filter_->GetFilteringBehaviorForURL(url);
 
   if (state_ == NOT_RECORDING_URLS && !CanTemporarilyNavigateHost(url))
     ClearObserverState();
@@ skipping 45 matching lines @@
       case NOT_RECORDING_URLS:
         // Check that the infobar is present.
         DCHECK(preview_infobar_delegate_);
         break;
     }
   }
 
   if (behavior == ManagedModeURLFilter::ALLOW)
     last_allowed_page_ = web_contents()->GetController().GetCurrentEntryIndex();
 }