Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ...

chrome/browser/extensions/extension_function.h

 // Copyright (c) 2011 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_EXTENSION_FUNCTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
 #pragma once
 
 #include <string>
 #include <list>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "chrome/browser/extensions/extension_info_map.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ipc/ipc_message.h"
 
 class Browser;
 class ChromeRenderMessageFilter;
 class ExtensionFunction;
 class ExtensionFunctionDispatcher;
 class UIThreadExtensionFunction;
 class IOThreadExtensionFunction;
 class ListValue;
+class Profile;
 class QuotaLimitHeuristic;
 class RenderViewHost;
 class Value;
 
 #define EXTENSION_FUNCTION_VALIDATE(test) do { \
     if (!(test)) { \
       bad_message_ = true; \
       return false; \
     } \
   } while (0)
@@ skipping 46 matching lines @@
   // be empty).
   virtual const std::string GetResult();
 
   // Retrieves any error string from the function.
   virtual const std::string GetError();
 
   // Specifies the name of the function.
   void set_name(const std::string& name) { name_ = name; }
   const std::string& name() const { return name_; }
 
-  void set_profile_id(ProfileId profile_id) { profile_id_ = profile_id; }
-  ProfileId profile_id() const { return profile_id_; }
+  void set_profile(void* profile) { profile_ = profile_; }
+  void* profile() const { return profile_; }
 
   void set_extension(const Extension* extension) { extension_ = extension; }
   const Extension* GetExtension() const { return extension_.get(); }
   const std::string& extension_id() const { return extension_->id(); }
 
   void set_request_id(int request_id) { request_id_ = request_id; }
   int request_id() { return request_id_; }
 
   void set_source_url(const GURL& source_url) { source_url_ = source_url; }
   const GURL& source_url() { return source_url_; }
@@ skipping 34 matching lines @@
   // the renderer instead.
   void HandleBadMessage(base::ProcessHandle process);
 
   // Return true if the argument to this function at |index| was provided and
   // is non-null.
   bool HasOptionalArgument(size_t index);
 
   // Id of this request, used to map the response back to the caller.
   int request_id_;
 
-  // The ID of the Profile of this function's extension.
-  ProfileId profile_id_;
+  // The Profile of this function's extension.
+  void* profile_;
 
   // The extension that called this function.
   scoped_refptr<const Extension> extension_;
 
   // The name of this function.
   std::string name_;
 
   // The URL of the frame which is making this request
   GURL source_url_;
 
@@ skipping 184 matching lines @@
  public:
   SyncIOThreadExtensionFunction();
 
   virtual void Run() OVERRIDE;
 
  protected:
   virtual ~SyncIOThreadExtensionFunction();
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_