Renaming instances of "flimflam" with "shill", now that we're only

chromeos/network/network_sms_handler_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 "chromeos/network/network_sms_handler.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
  protected:
   MessageLoopForUI message_loop_;
 };
 
 TEST_F(NetworkSmsHandlerTest, SmsHandlerDbusStub) {
   // Append '--sms-test-messages' to the command line to tell SMSClientStubImpl
   // to generate a series of test SMS messages.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(chromeos::switches::kSmsTestMessages);
 
-  // This relies on the stub dbus implementations for FlimflamManagerClient,
-  // FlimflamDeviceClient, GsmSMSClient, ModemMessagingClient and SMSClient.
+  // This relies on the stub dbus implementations for ShillManagerClient,
+  // ShillDeviceClient, GsmSMSClient, ModemMessagingClient and SMSClient.
   // Initialize a sms handler. The stub dbus clients will not send the
   // first test message until RequestUpdate has been called.
   scoped_ptr<NetworkSmsHandler> sms_handler(new NetworkSmsHandler());
   scoped_ptr<TestObserver> test_observer(new TestObserver());
   sms_handler->AddObserver(test_observer.get());
   sms_handler->Init();
   message_loop_.RunAllPending();
   EXPECT_EQ(test_observer->message_count(), 0);
 
   // Test that no messages have been received yet
   const std::set<std::string>& messages(test_observer->messages());
   // Note: The following string corresponds to values in
   // ModemMessagingClientStubImpl and SmsClientStubImpl.
   const char kMessage1[] = "SMSClientStubImpl: Test Message: /SMS/0";
   EXPECT_EQ(messages.find(kMessage1), messages.end());
 
   // Test for messages delivered by signals.
   test_observer->ClearMessages();
   sms_handler->RequestUpdate();
   message_loop_.RunAllPending();
   EXPECT_GE(test_observer->message_count(), 1);
   EXPECT_NE(messages.find(kMessage1), messages.end());
 }
 
 }  // namespace chromeos