4 files changed, 12 insertions, 7 deletions
diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
index dea7d7f..b994cca 100644
--- a/extensions/browser/extensions_browser_client.h
+++ b/extensions/browser/extensions_browser_client.h
@@ -10,10 +10,13 @@
 
 #include "base/memory/scoped_ptr.h"
 
-class CommandLine;
 class ExtensionFunctionRegistry;
 class PrefService;
 
+namespace base {
+class CommandLine;
+}
+
 namespace content {
 class BrowserContext;
 class JavaScriptDialogManager;
@@ -44,7 +47,7 @@ class ExtensionsBrowserClient {
 
   // Returns true if extensions have been disabled (e.g. via a command-line flag
   // or preference).
-  virtual bool AreExtensionsDisabled(const CommandLine& command_line,
+  virtual bool AreExtensionsDisabled(const base::CommandLine& command_line,
                                      content::BrowserContext* context) = 0;
 
   // Returns true if the |context| is known to the embedder.
diff --git a/extensions/browser/test_extensions_browser_client.cc b/extensions/browser/test_extensions_browser_client.cc
index 792efc8..b9cd561 100644
--- a/extensions/browser/test_extensions_browser_client.cc
+++ b/extensions/browser/test_extensions_browser_client.cc
@@ -29,7 +29,7 @@ void TestExtensionsBrowserClient::SetIncognitoContext(BrowserContext* context) {
 bool TestExtensionsBrowserClient::IsShuttingDown() { return false; }
 
 bool TestExtensionsBrowserClient::AreExtensionsDisabled(
-    const CommandLine& command_line,
+    const base::CommandLine& command_line,
     BrowserContext* context) {
   return false;
 }
diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
index 1f1030a..538fc0c 100644
--- a/extensions/browser/test_extensions_browser_client.h
+++ b/extensions/browser/test_extensions_browser_client.h
@@ -24,7 +24,7 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
 
   // ExtensionsBrowserClient overrides:
   virtual bool IsShuttingDown() OVERRIDE;
-  virtual bool AreExtensionsDisabled(const CommandLine& command_line,
+  virtual bool AreExtensionsDisabled(const base::CommandLine& command_line,
                                      content::BrowserContext* context) OVERRIDE;
   virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE;
   virtual bool IsSameContext(content::BrowserContext* first,
diff --git a/extensions/common/feature_switch.h b/extensions/common/feature_switch.h
index 40143d6..90db74a 100644
--- a/extensions/common/feature_switch.h
+++ b/extensions/common/feature_switch.h
@@ -9,7 +9,9 @@
 
 #include "base/basictypes.h"
 
+namespace base {
 class CommandLine;
+}
 
 namespace extensions {
 
@@ -50,7 +52,7 @@ class FeatureSwitch {
   // by the default and override values.
   FeatureSwitch(const char* switch_name,
                 DefaultValue default_value);
-  FeatureSwitch(const CommandLine* command_line,
+  FeatureSwitch(const base::CommandLine* command_line,
                 const char* switch_name,
                 DefaultValue default_value);
 
@@ -61,14 +63,14 @@ class FeatureSwitch {
   bool IsEnabled() const;
 
  private:
-  void Init(const CommandLine* command_line,
+  void Init(const base::CommandLine* command_line,
             const char* switch_name,
             DefaultValue default_value);
 
   std::string GetLegacyEnableFlag() const;
   std::string GetLegacyDisableFlag() const;
 
-  const CommandLine* command_line_;
+  const base::CommandLine* command_line_;
   const char* switch_name_;
   bool default_value_;
   OverrideValue override_value_;