[Extensions] Update TabHelper to use ExtensionId

chrome/browser/extensions/tab_helper.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_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include <memory>
 #include <set>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/active_tab_permission_granter.h"
 #include "chrome/browser/extensions/extension_reenabler.h"
 #include "chrome/common/extensions/webstore_install_result.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/script_execution_observer.h"
 #include "extensions/browser/script_executor.h"
+#include "extensions/common/extension_id.h"
 #include "extensions/common/stack_frame.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class FaviconDownloader;
 
 namespace content {
 struct LoadCommittedDetails;
 class RenderFrameHost;
 }
 
@@ skipping 36 matching lines @@
   // the extension. It's up to consumers of WebContents to do that.
   //
   // NOTE: this should only be manipulated before the tab is added to a browser.
   // TODO(sky): resolve if this is the right way to identify an app tab. If it
   // is, than this should be passed in the constructor.
   void SetExtensionApp(const Extension* extension);
 
   // Convenience for setting the app extension by id. This does nothing if
   // |extension_app_id| is empty, or an extension can't be found given the
   // specified id.
-  void SetExtensionAppById(const std::string& extension_app_id);
+  void SetExtensionAppById(const ExtensionId& extension_app_id);
 
   // Set just the app icon, used by panels created by an extension.
-  void SetExtensionAppIconById(const std::string& extension_app_id);
+  void SetExtensionAppIconById(const ExtensionId& extension_app_id);
 
   const Extension* extension_app() const { return extension_app_; }
   bool is_app() const { return extension_app_ != NULL; }
   const WebApplicationInfo& web_app_info() const {
     return web_app_info_;
   }
 
   // If an app extension has been explicitly set for this WebContents its icon
   // is returned.
   //
@@ skipping 87 matching lines @@
       content::RenderFrameHost* host,
       const ScriptExecutionObserver::ExecutingScriptsMap& extension_ids,
       const GURL& on_url);
 
   // App extensions related methods:
 
   // Resets app_icon_ and if |extension| is non-null uses ImageLoader to load
   // the extension's image asynchronously.
   void UpdateExtensionAppIcon(const Extension* extension);
 
-  const Extension* GetExtension(const std::string& extension_app_id);
+  const Extension* GetExtension(const ExtensionId& extension_app_id);
 
   void OnImageLoaded(const gfx::Image& image);
 
   // WebstoreStandaloneInstaller::Callback.
   void OnInlineInstallComplete(int install_id,
                                int return_route_id,
-                               const std::string& extension_id,
+                               const ExtensionId& extension_id,
                                bool success,
                                const std::string& error,
                                webstore_install::Result result);
 
   // ExtensionReenabler::Callback.
   void OnReenableComplete(int install_id,
                           int return_route_id,
-                          const std::string& extension_id,
+                          const ExtensionId& extension_id,
                           ExtensionReenabler::ReenableResult result);
 
   // content::NotificationObserver.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Requests application info for the specified page. This is an asynchronous
   // request. The delegate is notified by way of OnDidGetApplicationInfo when
   // the data is available.
@@ skipping 45 matching lines @@
   // Creates WebstoreInlineInstaller instances for inline install triggers.
   std::unique_ptr<WebstoreInlineInstallerFactory>
       webstore_inline_installer_factory_;
 
   // The reenable prompt for disabled extensions, if any.
   std::unique_ptr<ExtensionReenabler> extension_reenabler_;
 
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       registry_observer_;
 
-  // Map of extension id -> InlineInstallObserver for inline installations that
-  // have progress listeners.
-  std::map<std::string, std::unique_ptr<InlineInstallObserver>>
+  // Map of InlineInstallObservers for inline installations that have progress
+  // listeners.
+  std::map<ExtensionId, std::unique_ptr<InlineInstallObserver>>
       install_observers_;
 
   // The set of extension ids that are currently being installed.
-  std::set<std::string> pending_inline_installations_;
+  std::set<ExtensionId> pending_inline_installations_;
 
   // Vend weak pointers that can be invalidated to stop in-progress loads.
   base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
 
   // Generic weak ptr factory for posting callbacks.
   base::WeakPtrFactory<TabHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_