Move small c/b/extensions classes into extensions namespace no.1

Since these classes are small, they can be all be moved in one cl without it becoming overly large.

This one moves:
- AppShortcutManager
- AutoUpdateInterceptor
- ConvertWebApp
- ExtensionActivityLog (now extensions::ActivityLog)

BUG=117261
TBR=jam@chromium.org, willchan@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10824198

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152159 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 103 insertions, 73 deletions

diff --git a/chrome/browser/extensions/extension_activity_log.cc b/chrome/browser/extensions/activity_log.cc
index ea9a048..937ee84 100644
--- a/chrome/browser/extensions/extension_activity_log.cc
+++ b/chrome/browser/extensions/activity_log.cc
@@ -2,29 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_activity_log.h"
+#include "chrome/browser/extensions/activity_log.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 
-ExtensionActivityLog::ExtensionActivityLog() {
+namespace extensions {
+
+ActivityLog::ActivityLog() {
   log_activity_to_stdout_ = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableExtensionActivityLogging);
 }
 
-ExtensionActivityLog::~ExtensionActivityLog() {
+ActivityLog::~ActivityLog() {
 }
 
 // static
-ExtensionActivityLog* ExtensionActivityLog::GetInstance() {
-  return Singleton<ExtensionActivityLog>::get();
+ActivityLog* ActivityLog::GetInstance() {
+  return Singleton<ActivityLog>::get();
 }
 
-void ExtensionActivityLog::AddObserver(
-    const extensions::Extension* extension,
-    ExtensionActivityLog::Observer* observer) {
+void ActivityLog::AddObserver(const Extension* extension,
+                              ActivityLog::Observer* observer) {
   base::AutoLock scoped_lock(lock_);
 
   if (observers_.count(extension) == 0) {
@@ -34,18 +35,17 @@ void ExtensionActivityLog::AddObserver(
   observers_[extension]->AddObserver(observer);
 }
 
-void ExtensionActivityLog::RemoveObserver(
-    const extensions::Extension* extension,
-    ExtensionActivityLog::Observer* observer) {
+void ActivityLog::RemoveObserver(const Extension* extension,
+                                 ActivityLog::Observer* observer) {
   base::AutoLock scoped_lock(lock_);
 
   if (observers_.count(extension) == 1) {
     observers_[extension]->RemoveObserver(observer);
   }
 }
+
 // Extension*
-bool ExtensionActivityLog::HasObservers(
-    const extensions::Extension* extension) const {
+bool ActivityLog::HasObservers(const Extension* extension) const {
   base::AutoLock scoped_lock(lock_);
 
   // We also return true if extension activity logging is enabled since in that
@@ -53,9 +53,9 @@ bool ExtensionActivityLog::HasObservers(
   return observers_.count(extension) > 0 || log_activity_to_stdout_;
 }
 
-void ExtensionActivityLog::Log(const extensions::Extension* extension,
-                               Activity activity,
-                               const std::string& msg) const {
+void ActivityLog::Log(const Extension* extension,
+                      Activity activity,
+                      const std::string& msg) const {
   base::AutoLock scoped_lock(lock_);
 
   ObserverMap::const_iterator iter = observers_.find(extension);
@@ -70,14 +70,16 @@ void ExtensionActivityLog::Log(const extensions::Extension* extension,
 }
 
 // static
-const char* ExtensionActivityLog::ActivityToString(Activity activity) {
+const char* ActivityLog::ActivityToString(Activity activity) {
   switch (activity) {
-    case ExtensionActivityLog::ACTIVITY_EXTENSION_API_CALL:
+    case ActivityLog::ACTIVITY_EXTENSION_API_CALL:
       return "api_call";
-    case ExtensionActivityLog::ACTIVITY_EXTENSION_API_BLOCK:
+    case ActivityLog::ACTIVITY_EXTENSION_API_BLOCK:
       return "api_block";
     default:
       NOTREACHED();
       return "";
   }
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_activity_log.h b/chrome/browser/extensions/activity_log.h
index ffef1d6..d9c459a 100644
--- a/chrome/browser/extensions/extension_activity_log.h
+++ b/chrome/browser/extensions/activity_log.h
@@ -2,8 +2,8 @@
 // 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_ACTIVITY_LOG_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTIVITY_LOG_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
+#define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
 
 #include <map>
 #include <string>
@@ -14,10 +14,9 @@
 
 namespace extensions {
 class Extension;
-}
 
 // A utility for tracing interesting activity for each extension.
-class ExtensionActivityLog {
+class ActivityLog {
  public:
   enum Activity {
     ACTIVITY_EXTENSION_API_CALL,  // Extension API invocation is called.
@@ -27,30 +26,30 @@ class ExtensionActivityLog {
   // Observers can listen for activity events.
   class Observer {
    public:
-    virtual void OnExtensionActivity(const extensions::Extension* extension,
+    virtual void OnExtensionActivity(const Extension* extension,
                                      Activity activity,
                                      const std::string& msg) = 0;
   };
 
-  ~ExtensionActivityLog();
-  static ExtensionActivityLog* GetInstance();
+  ~ActivityLog();
+  static ActivityLog* GetInstance();
 
   // Add/remove observer.
-  void AddObserver(const extensions::Extension* extension, Observer* observer);
-  void RemoveObserver(const extensions::Extension* extension,
+  void AddObserver(const Extension* extension, Observer* observer);
+  void RemoveObserver(const Extension* extension,
                       Observer* observer);
 
   // Check for the existence observer list by extension_id.
-  bool HasObservers(const extensions::Extension* extension) const;
+  bool HasObservers(const Extension* extension) const;
 
   // Log |activity| for |extension|.
-  void Log(const extensions::Extension* extension,
+  void Log(const Extension* extension,
            Activity activity,
            const std::string& msg) const;
 
  private:
-  ExtensionActivityLog();
-  friend struct DefaultSingletonTraits<ExtensionActivityLog>;
+  ActivityLog();
+  friend struct DefaultSingletonTraits<ActivityLog>;
 
   static const char* ActivityToString(Activity activity);
 
@@ -62,12 +61,14 @@ class ExtensionActivityLog {
   bool log_activity_to_stdout_;
 
   typedef ObserverListThreadSafe<Observer> ObserverList;
-  typedef std::map<const extensions::Extension*, scoped_refptr<ObserverList> >
+  typedef std::map<const Extension*, scoped_refptr<ObserverList> >
       ObserverMap;
   // A map of extensions to activity observers for that extension.
   ObserverMap observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionActivityLog);
+  DISALLOW_COPY_AND_ASSIGN(ActivityLog);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTIVITY_LOG_H_
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_H_
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index 9f88333..4809ad1 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -244,7 +244,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_AutoUpdate) {
   NotificationListener notification_listener;
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
   // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
+  scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
+      new extensions::AutoUpdateInterceptor());
   net::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
@@ -323,7 +324,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
   NotificationListener notification_listener;
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
   // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
+  scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
+      new extensions::AutoUpdateInterceptor());
   net::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
@@ -384,7 +386,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
 
   // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
+  scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
+      new extensions::AutoUpdateInterceptor());
   net::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
@@ -467,7 +470,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
   FilePath basedir = test_data_dir_.AppendASCII("autoupdate");
 
   // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
+  scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
+      new extensions::AutoUpdateInterceptor());
   net::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
@@ -542,7 +546,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
   ASSERT_TRUE(service->disabled_extensions()->is_empty());
 
   // Note: This interceptor gets requests on the IO thread.
-  scoped_refptr<AutoUpdateInterceptor> interceptor(new AutoUpdateInterceptor());
+  scoped_refptr<extensions::AutoUpdateInterceptor> interceptor(
+      new extensions::AutoUpdateInterceptor());
   net::URLFetcher::SetEnableInterceptionForTests(true);
 
   interceptor->SetResponseOnIOThread("http://localhost/autoupdate/manifest",
diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc
index 6d8fc81..e75a5db 100644
--- a/chrome/browser/extensions/app_shortcut_manager.cc
+++ b/chrome/browser/extensions/app_shortcut_manager.cc
@@ -17,7 +17,7 @@
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 
-using extensions::Extension;
+namespace extensions {
 
 namespace {
 // Allow tests to disable shortcut creation, to prevent developers' desktops
@@ -153,3 +153,5 @@ void AppShortcutManager::DeleteApplicationShortcuts(
       ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/app_shortcut_manager.h b/chrome/browser/extensions/app_shortcut_manager.h
index 1b0a94d..872cd73 100644
--- a/chrome/browser/extensions/app_shortcut_manager.h
+++ b/chrome/browser/extensions/app_shortcut_manager.h
@@ -13,6 +13,7 @@
 
 class Profile;
 
+namespace extensions {
 // This class manages the installation of shortcuts for platform apps.
 class AppShortcutManager : public ImageLoadingTracker::Observer,
                            public content::NotificationObserver {
@@ -35,8 +36,8 @@ class AppShortcutManager : public ImageLoadingTracker::Observer,
   static void SetShortcutCreationDisabledForTesting(bool disabled);
  private:
   // Install the shortcuts for an application.
-  void InstallApplicationShortcuts(const extensions::Extension* extension);
-  void DeleteApplicationShortcuts(const extensions::Extension* extension);
+  void InstallApplicationShortcuts(const Extension* extension);
+  void DeleteApplicationShortcuts(const Extension* extension);
 
   content::NotificationRegistrar registrar_;
   Profile* profile_;
@@ -47,5 +48,6 @@ class AppShortcutManager : public ImageLoadingTracker::Observer,
 
   DISALLOW_COPY_AND_ASSIGN(AppShortcutManager);
 };
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_APP_SHORTCUT_MANAGER_H_
diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index 50beca4..34e01b6 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -13,6 +13,8 @@
 
 using content::BrowserThread;
 
+namespace extensions {
+
 // This is a specialized version of net::URLRequestTestJob that lets us specify
 // response data and make sure the response code is 200, which the autoupdate
 // code relies on.
@@ -91,3 +93,5 @@ void AutoUpdateInterceptor::SetResponseOnIOThread(const std::string url,
       BrowserThread::IO, FROM_HERE,
       base::Bind(&AutoUpdateInterceptor::SetResponse, this, url, path));
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/autoupdate_interceptor.h b/chrome/browser/extensions/autoupdate_interceptor.h
index 8fbcc3e..36dd7c9 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.h
+++ b/chrome/browser/extensions/autoupdate_interceptor.h
@@ -11,6 +11,8 @@
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request.h"
 
+namespace extensions {
+
 // This url request interceptor lets us respond to localhost http request urls
 // with the contents of files on disk for use in tests.
 class AutoUpdateInterceptor
@@ -42,4 +44,6 @@ class AutoUpdateInterceptor
   DISALLOW_COPY_AND_ASSIGN(AutoUpdateInterceptor);
 };
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_EXTENSIONS_AUTOUPDATE_INTERCEPTOR_H_
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc
index a114cc3..35cef04 100644
--- a/chrome/browser/extensions/convert_web_app.cc
+++ b/chrome/browser/extensions/convert_web_app.cc
@@ -29,10 +29,11 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
+namespace extensions {
+
 namespace keys = extension_manifest_keys;
 
 using base::Time;
-using extensions::Extension;
 
 namespace {
 
@@ -195,3 +196,5 @@ scoped_refptr<Extension> ConvertWebAppToExtension(
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/convert_web_app.h b/chrome/browser/extensions/convert_web_app.h
index b792c5c..0bff0e5 100644
--- a/chrome/browser/extensions/convert_web_app.h
+++ b/chrome/browser/extensions/convert_web_app.h
@@ -14,11 +14,10 @@ namespace base {
 class Time;
 }
 
+struct WebApplicationInfo;
+
 namespace extensions {
 class Extension;
-}
-
-struct WebApplicationInfo;
 
 // Generates a version number for an extension from a time. The goal is to make
 // use of the version number to communicate the date in a human readable form,
@@ -38,8 +37,10 @@ std::string ConvertTimeToExtensionVersion(const base::Time& time);
 // NOTE: This function does file IO and should not be called on the UI thread.
 // NOTE: The caller takes ownership of the directory at extension->path() on the
 // returned object.
-scoped_refptr<extensions::Extension> ConvertWebAppToExtension(
+scoped_refptr<Extension> ConvertWebAppToExtension(
     const WebApplicationInfo& web_app_info,
     const base::Time& create_time);
 
+}  // namespace extensions
+
 #endif  // CHROME_BROWSER_EXTENSIONS_CONVERT_WEB_APP_H_
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc
index 23efe82..b773a18 100644
--- a/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -19,7 +19,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
-using extensions::APIPermission;
+namespace extensions {
 
 class ExtensionFromWebAppTest
     : public InProcessBrowserTest, public content::NotificationObserver {
@@ -28,7 +28,7 @@ class ExtensionFromWebAppTest
   }
 
   std::string expected_extension_id_;
-  const extensions::Extension* installed_extension_;
+  const Extension* installed_extension_;
 
  private:
   // InProcessBrowserTest
@@ -41,8 +41,8 @@ class ExtensionFromWebAppTest
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     if (type == chrome::NOTIFICATION_EXTENSION_INSTALLED) {
-      const extensions::Extension* extension =
-          content::Details<const extensions::Extension>(details).ptr();
+      const Extension* extension =
+          content::Details<const Extension>(details).ptr();
       if (extension->id() == expected_extension_id_) {
         installed_extension_ = extension;
         MessageLoopForUI::current()->Quit();
@@ -90,3 +90,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, Basic) {
   EXPECT_EQ("icons/128.png", installed_extension_->icons().Get(
       128, ExtensionIconSet::MATCH_EXACTLY));
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index f869ee0..0767ac6 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -27,6 +27,8 @@
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/image_decoder.h"
 
+namespace extensions {
+
 namespace {
 
 // Returns an icon info corresponding to a canned icon.
@@ -106,7 +108,7 @@ TEST(ExtensionFromWebApp, Basic) {
     web_app.icons.push_back(GetIconInfo(icon_url, sizes[i]));
   }
 
-  scoped_refptr<extensions::Extension> extension = ConvertWebAppToExtension(
+  scoped_refptr<Extension> extension = ConvertWebAppToExtension(
       web_app, GetTestTime(1978, 12, 11, 0, 0, 0, 0));
   ASSERT_TRUE(extension.get());
 
@@ -149,7 +151,7 @@ TEST(ExtensionFromWebApp, Minimal) {
   web_app.title = ASCIIToUTF16("Gearpad");
   web_app.app_url = GURL("http://aaronboodman.com/gearpad/");
 
-  scoped_refptr<extensions::Extension> extension = ConvertWebAppToExtension(
+  scoped_refptr<Extension> extension = ConvertWebAppToExtension(
       web_app, GetTestTime(1978, 12, 11, 0, 0, 0, 0));
   ASSERT_TRUE(extension.get());
 
@@ -173,3 +175,5 @@ TEST(ExtensionFromWebApp, Minimal) {
   EXPECT_EQ("*://aaronboodman.com/*",
             extension->web_extent().patterns().begin()->GetAsString());
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 30955bf..45f9e58 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -50,11 +50,11 @@ ExtensionBrowserTest::ExtensionBrowserTest()
       target_visible_page_action_count_(-1),
       current_channel_(chrome::VersionInfo::CHANNEL_DEV) {
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
-  AppShortcutManager::SetShortcutCreationDisabledForTesting(true);
+  extensions::AppShortcutManager::SetShortcutCreationDisabledForTesting(true);
 }
 
 ExtensionBrowserTest::~ExtensionBrowserTest() {
-  AppShortcutManager::SetShortcutCreationDisabledForTesting(false);
+  extensions::AppShortcutManager::SetShortcutCreationDisabledForTesting(false);
 }
 
 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 565c1248..566fd28 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -12,7 +12,7 @@
 #include "base/process_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/extensions/extension_activity_log.h"
+#include "chrome/browser/extensions/activity_log.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -45,9 +45,9 @@ const char kQuotaExceeded[] = "quota exceeded";
 
 void LogSuccess(const Extension* extension,
                 const ExtensionHostMsg_Request_Params& params) {
-  ExtensionActivityLog* extension_activity_log =
-      ExtensionActivityLog::GetInstance();
-  if (extension_activity_log->HasObservers(extension)) {
+  extensions::ActivityLog* activity_log =
+      extensions::ActivityLog::GetInstance();
+  if (activity_log->HasObservers(extension)) {
     std::string call_signature = params.name + "(";
     ListValue::const_iterator it = params.arguments.begin();
     for (; it != params.arguments.end(); ++it) {
@@ -61,23 +61,21 @@ void LogSuccess(const Extension* extension,
     }
     call_signature += ")";
 
-    extension_activity_log->Log(
-        extension,
-        ExtensionActivityLog::ACTIVITY_EXTENSION_API_CALL,
-        call_signature);
+    activity_log->Log(extension,
+                      extensions::ActivityLog::ACTIVITY_EXTENSION_API_CALL,
+                      call_signature);
   }
 }
 
 void LogFailure(const Extension* extension,
                 const std::string& func_name,
                 const char* reason) {
-  ExtensionActivityLog* extension_activity_log =
-      ExtensionActivityLog::GetInstance();
-  if (extension_activity_log->HasObservers(extension)) {
-    extension_activity_log->Log(
-        extension,
-        ExtensionActivityLog::ACTIVITY_EXTENSION_API_BLOCK,
-        func_name + ": " + reason);
+  extensions::ActivityLog* activity_log =
+      extensions::ActivityLog::GetInstance();
+  if (activity_log->HasObservers(extension)) {
+    activity_log->Log(extension,
+                      extensions::ActivityLog::ACTIVITY_EXTENSION_API_BLOCK,
+                      func_name + ": " + reason);
   }
 }
 
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 7e53bb1..71ee1c2 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -619,7 +619,9 @@ class ExtensionService
     return &extension_warnings_;
   }
 
-  AppShortcutManager* app_shortcut_manager() { return &app_shortcut_manager_; }
+  extensions::AppShortcutManager* app_shortcut_manager() {
+    return &app_shortcut_manager_;
+  }
 
   // Specialization of syncer::SyncableService::AsWeakPtr.
   base::WeakPtr<ExtensionService> AsWeakPtr() { return base::AsWeakPtr(this); }
@@ -856,7 +858,7 @@ class ExtensionService
 
   extensions::ProcessMap process_map_;
 
-  AppShortcutManager app_shortcut_manager_;
+  extensions::AppShortcutManager app_shortcut_manager_;
 
   scoped_ptr<ExtensionErrorUI> extension_error_ui_;