Move c/c/e/extension_set to top-level extensions/

chrome/browser/ui/sync/profile_signin_confirmation_helper.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/sync/profile_signin_confirmation_helper.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 
 // TODO(dconnelly): change VLOG to DVLOG (crbug.com/240195)
 
 namespace {
 
 const int kHistoryEntriesBeforeNewProfilePrompt = 10;
 
 // Determines whether a profile has any typed URLs in its history.
@@ skipping 158 matching lines @@
   bool has_been_shutdown = !profile->IsNewProfile();
   if (has_been_shutdown)
     VLOG(1) << "ProfileSigninConfirmationHelper: profile is not new";
   return has_been_shutdown;
 }
 
 bool HasSyncedExtensions(Profile* profile) {
   extensions::ExtensionSystem* system =
       extensions::ExtensionSystem::Get(profile);
   if (system && system->extension_service()) {
-    const ExtensionSet* extensions = system->extension_service()->extensions();
-    for (ExtensionSet::const_iterator iter = extensions->begin();
+    const extensions::ExtensionSet* extensions =
+        system->extension_service()->extensions();
+    for (extensions::ExtensionSet::const_iterator iter = extensions->begin();
          iter != extensions->end(); ++iter) {
       // The webstore is synced so that it stays put on the new tab
       // page, but since it's installed by default we don't want to
       // consider it when determining if the profile is dirty.
       if (extensions::sync_helper::IsSyncable(iter->get()) &&
           (*iter)->id() != extension_misc::kWebStoreAppId &&
           (*iter)->id() != extension_misc::kChromeAppId) {
         VLOG(1) << "ProfileSigninConfirmationHelper: "
                 << "profile contains a synced extension: " << (*iter)->id();
         return true;
@@ skipping 15 matching lines @@
   // Fire asynchronous queries for profile data.
   scoped_refptr<ProfileSigninConfirmationHelper> helper =
       new ProfileSigninConfirmationHelper(profile, return_result);
   const int requests = 2;
   helper->set_pending_requests(requests);
   helper->CheckHasHistory(kHistoryEntriesBeforeNewProfilePrompt);
   helper->CheckHasTypedURLs();
 }
 
 }  // namespace ui