Replace string16 with base::string16.

chrome/browser/background/background_contents_service_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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 19 matching lines @@
   virtual void SetUp() {
     command_line_.reset(new CommandLine(CommandLine::NO_PROGRAM));
   }
 
   const DictionaryValue* GetPrefs(Profile* profile) {
     return profile->GetPrefs()->GetDictionary(
         prefs::kRegisteredBackgroundContents);
   }
 
   // Returns the stored pref URL for the passed app id.
-  std::string GetPrefURLForApp(Profile* profile, const string16& appid) {
+  std::string GetPrefURLForApp(Profile* profile, const base::string16& appid) {
     const DictionaryValue* pref = GetPrefs(profile);
     EXPECT_TRUE(pref->HasKey(UTF16ToUTF8(appid)));
     const DictionaryValue* value;
     pref->GetDictionaryWithoutPathExpansion(UTF16ToUTF8(appid), &value);
     std::string url;
     value->GetString("url", &url);
     return url;
   }
 
   scoped_ptr<CommandLine> command_line_;
 };
 
 class MockBackgroundContents : public BackgroundContents {
  public:
   explicit MockBackgroundContents(Profile* profile)
       : appid_(ASCIIToUTF16("app_id")),
         profile_(profile) {
   }
   MockBackgroundContents(Profile* profile, const std::string& id)
       : appid_(ASCIIToUTF16(id)),
         profile_(profile) {
   }
 
   void SendOpenedNotification(BackgroundContentsService* service) {
-    string16 frame_name = ASCIIToUTF16("background");
+    base::string16 frame_name = ASCIIToUTF16("background");
     BackgroundContentsOpenedDetails details = {
         this, frame_name, appid_ };
     service->BackgroundContentsOpened(&details);
   }
 
   virtual void Navigate(GURL url) {
     url_ = url;
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
         content::Source<Profile>(profile_),
         content::Details<BackgroundContents>(this));
   }
   virtual const GURL& GetURL() const OVERRIDE { return url_; }
 
   void MockClose(Profile* profile) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_BACKGROUND_CONTENTS_CLOSED,
         content::Source<Profile>(profile),
         content::Details<BackgroundContents>(this));
     delete this;
   }
 
   virtual ~MockBackgroundContents() {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
         content::Source<Profile>(profile_),
         content::Details<BackgroundContents>(this));
   }
 
-  const string16& appid() { return appid_; }
+  const base::string16& appid() { return appid_; }
 
  private:
   GURL url_;
 
   // The ID of our parent application
-  string16 appid_;
+  base::string16 appid_;
 
   // Parent profile
   Profile* profile_;
 };
 
 TEST_F(BackgroundContentsServiceTest, Create) {
   // Check for creation and leaks.
   TestingProfile profile;
   BackgroundContentsService service(&profile, command_line_.get());
 }
@@ skipping 114 matching lines @@
   contents->Navigate(url);
   EXPECT_EQ(1U, GetPrefs(&profile)->size());
   contents2->Navigate(url2);
   EXPECT_EQ(2U, GetPrefs(&profile)->size());
   service.ShutdownAssociatedBackgroundContents(ASCIIToUTF16("appid"));
   EXPECT_FALSE(service.IsTracked(contents));
   EXPECT_EQ(NULL, service.GetAppBackgroundContents(ASCIIToUTF16("appid")));
   EXPECT_EQ(1U, GetPrefs(&profile)->size());
   EXPECT_EQ(url2.spec(), GetPrefURLForApp(&profile, contents2->appid()));
 }