Move ProfileKeyedAPI implementations to take BrowserContext in the constructor (part 1).

chrome/browser/extensions/api/bookmarks/bookmarks_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "extensions/browser/event_router.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
-class Profile;
-
 namespace base {
 class FilePath;
 class ListValue;
 }
 
+namespace content {
+class BrowserContext;
+}
+
 namespace extensions {
 
 // Observes BookmarkModel and then routes the notifications as events to
 // the extension system.
 class BookmarkEventRouter : public BookmarkModelObserver {
  public:
-  BookmarkEventRouter(Profile* profile, BookmarkModel* model);
+  BookmarkEventRouter(content::BrowserContext* context, BookmarkModel* model);
   virtual ~BookmarkEventRouter();
 
   // BookmarkModelObserver:
   virtual void BookmarkModelLoaded(BookmarkModel* model,
                                    bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
@@ skipping 13 matching lines @@
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
                                              const BookmarkNode* node) OVERRIDE;
   virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE;
   virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE;
 
  private:
   // Helper to actually dispatch an event to extension listeners.
   void DispatchEvent(const std::string& event_name,
                      scoped_ptr<base::ListValue> event_args);
 
-  Profile* profile_;
+  content::BrowserContext* context_;
   BookmarkModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEventRouter);
 };
 
 class BookmarksAPI : public ProfileKeyedAPI,
                      public EventRouter::Observer {
  public:
-  explicit BookmarksAPI(Profile* profile);
+  explicit BookmarksAPI(content::BrowserContext* context);
   virtual ~BookmarksAPI();
 
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
   // ProfileKeyedAPI implementation.
   static ProfileKeyedAPIFactory<BookmarksAPI>* GetFactoryInstance();
 
   // EventRouter::Observer implementation.
   virtual void OnListenerAdded(
       const EventListenerInfo& details) OVERRIDE;
 
  private:
   friend class ProfileKeyedAPIFactory<BookmarksAPI>;
 
-  Profile* profile_;
+  content::BrowserContext* context_;
 
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
     return "BookmarksAPI";
   }
   static const bool kServiceIsNULLWhileTesting = true;
 
   // Created lazily upon OnListenerAdded.
   scoped_ptr<BookmarkEventRouter> bookmark_event_router_;
 };
@@ skipping 229 matching lines @@
  private:
   virtual ~BookmarksExportFunction() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_BOOKMARKS_BOOKMARKS_API_H_