Cleanup: Remove dead switch in WebIntentsRegistryTest.

chrome/browser/intents/web_intents_registry_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 61 matching lines @@
   scoped_refptr<Extension> extension = LoadExtension(name, &error);
   EXPECT_TRUE(extension) << name;
   EXPECT_EQ("", error) << name;
   return extension;
 }
 
 }  // namespace
 
 class WebIntentsRegistryTest : public testing::Test {
  public:
-   WebIntentsRegistryTest()
-     : ui_thread_(BrowserThread::UI, &message_loop_),
-       db_thread_(BrowserThread::DB) {}
+  WebIntentsRegistryTest()
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        db_thread_(BrowserThread::DB) {}
 
  protected:
   virtual void SetUp() {
-    CommandLine::ForCurrentProcess()->AppendSwitch("--enable-web-intents");
-
     db_thread_.Start();
     wds_ = new WebDataService();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     wds_->Init(temp_dir_.path());
     registry_.Initialize(wds_, &extension_service_);
     EXPECT_CALL(extension_service_, extensions()).
         WillRepeatedly(testing::Return(&extensions_));
     EXPECT_CALL(extension_service_, GetExtensionById(testing::_, testing::_)).
         WillRepeatedly(
             testing::Invoke(this, &WebIntentsRegistryTest::GetExtensionById));
   }
 
   virtual void TearDown() {
     // Clear all references to wds to force it destruction.
     wds_->ShutdownOnUIThread();
     wds_ = NULL;
 
     // Schedule another task on the DB thread to notify us that it's safe to
     // carry on with the test.
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+                            base::Bind(&base::WaitableEvent::Signal,
+                                       base::Unretained(&done)));
     done.Wait();
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
   }
 
   const Extension* GetExtensionById(const std::string& extension_id,
                                     testing::Unused) {
     for (ExtensionSet::const_iterator iter = extensions_.begin();
          iter != extensions_.end(); ++iter) {
@@ skipping 10 matching lines @@
   scoped_refptr<WebDataService> wds_;
   MockExtensionService extension_service_;
   ExtensionSet extensions_;
   WebIntentsRegistry registry_;
   ScopedTempDir temp_dir_;
 };
 
 // Base consumer for WebIntentsRegistry results.
 class TestConsumer {
  public:
-   // Wait for the UI message loop to terminate - happens when OnIntesQueryDone
-   // is invoked.
-   void WaitForData() {
-     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-     MessageLoop::current()->Run();
-   }
+  // Wait for the UI message loop to terminate - happens when OnIntesQueryDone
+  // is invoked.
+  void WaitForData() {
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Run();
+  }
 };
 
 // Consumer of service lists. Stores result data and
 // terminates UI thread when callback is invoked.
 class ServiceListConsumer : public TestConsumer {
  public:
-   void Accept(
-       const std::vector<webkit_glue::WebIntentServiceData>& services) {
-     services_ = services;
+  void Accept(
+      const std::vector<webkit_glue::WebIntentServiceData>& services) {
+    services_ = services;
 
-     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-     MessageLoop::current()->Quit();
-   }
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Quit();
+  }
 
-   bool ResultsContain(const webkit_glue::WebIntentServiceData& service) {
-     for (size_t i = 0; i < services_.size(); ++i) {
-       if (services_[i] == service)
-         return true;
-     }
-     return false;
-   }
+  bool ResultsContain(const webkit_glue::WebIntentServiceData& service) {
+    for (size_t i = 0; i < services_.size(); ++i) {
+      if (services_[i] == service)
+        return true;
+    }
+    return false;
+  }
 
-   // Result data from callback.
-   std::vector<webkit_glue::WebIntentServiceData> services_;
+  // Result data from callback.
+  std::vector<webkit_glue::WebIntentServiceData> services_;
 };
 
 // Consume or defaultservice lists. Stores result data and
 // terminates UI thread when callback is invoked.
 class DefaultServiceListConsumer : public TestConsumer {
  public:
-   void Accept(const std::vector<DefaultWebIntentService>& services) {
-     services_ = services;
+  void Accept(const std::vector<DefaultWebIntentService>& services) {
+    services_ = services;
 
-     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-     MessageLoop::current()->Quit();
-   }
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Quit();
+  }
 
-   bool ResultsContain(const DefaultWebIntentService& service) {
-     for (size_t i = 0; i < services_.size(); ++i) {
-       if (services_[i] == service)
-         return true;
-     }
-     return false;
-   }
+  bool ResultsContain(const DefaultWebIntentService& service) {
+    for (size_t i = 0; i < services_.size(); ++i) {
+      if (services_[i] == service)
+        return true;
+    }
+    return false;
+  }
 
-   // Result data from callback.
-   std::vector<DefaultWebIntentService> services_;
+  // Result data from callback.
+  std::vector<DefaultWebIntentService> services_;
 };
 
 // Consumer of a default service. Stores result data and
 // terminates UI thread when callback is invoked.
 class DefaultServiceConsumer : public TestConsumer {
  public:
-   void Accept(
-       const DefaultWebIntentService& default_service) {
-     service_ = default_service;
+  void Accept(
+      const DefaultWebIntentService& default_service) {
+    service_ = default_service;
 
-     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-     MessageLoop::current()->Quit();
-   }
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    MessageLoop::current()->Quit();
+  }
 
-   // Result default data from callback.
-   DefaultWebIntentService service_;
+  // Result default data from callback.
+  DefaultWebIntentService service_;
 };
 
 TEST_F(WebIntentsRegistryTest, BasicTests) {
   webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
   service.title = ASCIIToUTF16("Google's Sharing Service");
 
   registry_.RegisterIntentService(service);
@@ skipping 63 matching lines @@
   service.action = ASCIIToUTF16("search");
   registry_.RegisterIntentService(service);
 
   ServiceListConsumer consumer;
   registry_.GetAllIntentServices(base::Bind(&ServiceListConsumer::Accept,
                                             base::Unretained(&consumer)));
   consumer.WaitForData();
   ASSERT_EQ(2U, consumer.services_.size());
 
   if (consumer.services_[0].action != ASCIIToUTF16("share"))
-    std::swap(consumer.services_[0],consumer.services_[1]);
+    std::swap(consumer.services_[0], consumer.services_[1]);
 
   service.action = ASCIIToUTF16("share");
   EXPECT_EQ(service, consumer.services_[0]);
 
   service.action = ASCIIToUTF16("search");
   EXPECT_EQ(service, consumer.services_[1]);
 }
 
 TEST_F(WebIntentsRegistryTest, GetExtensionIntents) {
   extensions_.Insert(LoadAndExpectSuccess("intent_valid.json"));
@@ skipping 423 matching lines @@
   ServiceListConsumer consumer;
   registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"),
                               ASCIIToUTF16("image/*"),
                               base::Bind(&ServiceListConsumer::Accept,
                                          base::Unretained(&consumer)));
 
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
   EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), consumer.services_[0].type);
 }