Replace string16 with base::string16.

chrome/browser/devtools/devtools_window.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 "chrome/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 63 matching lines @@
 
 // DevToolsConfirmInfoBarDelegate ---------------------------------------------
 
 class DevToolsConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // If |infobar_service| is NULL, runs |callback| with a single argument with
   // value "false".  Otherwise, creates a dev tools confirm infobar and delegate
   // and adds the inofbar to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      const DevToolsWindow::InfoBarCallback& callback,
-                     const string16& message);
+                     const base::string16& message);
 
  private:
   DevToolsConfirmInfoBarDelegate(
       InfoBarService* infobar_service,
       const DevToolsWindow::InfoBarCallback& callback,
-      const string16& message);
+      const base::string16& message);
   virtual ~DevToolsConfirmInfoBarDelegate();
 
-  virtual string16 GetMessageText() const OVERRIDE;
-  virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
+  virtual base::string16 GetMessageText() const OVERRIDE;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   DevToolsWindow::InfoBarCallback callback_;
-  const string16 message_;
+  const base::string16 message_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsConfirmInfoBarDelegate);
 };
 
 void DevToolsConfirmInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     const DevToolsWindow::InfoBarCallback& callback,
-    const string16& message) {
+    const base::string16& message) {
   if (!infobar_service) {
     callback.Run(false);
     return;
   }
 
   infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
       new DevToolsConfirmInfoBarDelegate(infobar_service, callback, message)));
 }
 
 DevToolsConfirmInfoBarDelegate::DevToolsConfirmInfoBarDelegate(
     InfoBarService* infobar_service,
     const DevToolsWindow::InfoBarCallback& callback,
-    const string16& message)
+    const base::string16& message)
     : ConfirmInfoBarDelegate(infobar_service),
       callback_(callback),
       message_(message) {
 }
 
 DevToolsConfirmInfoBarDelegate::~DevToolsConfirmInfoBarDelegate() {
   if (!callback_.is_null())
     callback_.Run(false);
 }
 
-string16 DevToolsConfirmInfoBarDelegate::GetMessageText() const {
+base::string16 DevToolsConfirmInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
-string16 DevToolsConfirmInfoBarDelegate::GetButtonLabel(
+base::string16 DevToolsConfirmInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_DEV_TOOLS_CONFIRM_ALLOW_BUTTON : IDS_DEV_TOOLS_CONFIRM_DENY_BUTTON);
 }
 
 bool DevToolsConfirmInfoBarDelegate::Accept() {
   callback_.Run(true);
   callback_.Reset();
   return true;
 }
@@ skipping 1147 matching lines @@
        it != file_paths.end(); ++it) {
     file_paths_value.AppendString(*it);
   }
   base::FundamentalValue request_id_value(request_id);
   StringValue file_system_path_value(file_system_path);
   CallClientFunction("InspectorFrontendAPI.searchCompleted", &request_id_value,
                      &file_system_path_value, &file_paths_value);
 }
 
 void DevToolsWindow::ShowDevToolsConfirmInfoBar(
-    const string16& message,
+    const base::string16& message,
     const InfoBarCallback& callback) {
   DevToolsConfirmInfoBarDelegate::Create(
       IsDocked() ?
           InfoBarService::FromWebContents(GetInspectedWebContents()) :
           InfoBarService::FromWebContents(web_contents_),
       callback, message);
 }
 
 void DevToolsWindow::CreateDevToolsBrowser() {
   std::string wp_key = GetDevToolsWindowPlacementPrefKey();
@@ skipping 168 matching lines @@
     params.append(json);
     if (arg2) {
       base::JSONWriter::Write(arg2, &json);
       params.append(", " + json);
       if (arg3) {
         base::JSONWriter::Write(arg3, &json);
         params.append(", " + json);
       }
     }
   }
-  string16 javascript = ASCIIToUTF16(function_name + "(" + params + ");");
+  base::string16 javascript = ASCIIToUTF16(function_name + "(" + params + ");");
   web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
       base::string16(), javascript);
 }
 
 void DevToolsWindow::UpdateBrowserToolbar() {
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateToolbar(NULL);
 }
 
@@ skipping 10 matching lines @@
   return inspected_contents_observer_ ?
       inspected_contents_observer_->web_contents() : NULL;
 }
 
 void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
   is_loaded_ = true;
   UpdateTheme();
   DoAction();
   AddDevToolsExtensionsToClient();
 }