Move nullable_string16.h to the string subdirectory.

content/browser/web_contents/web_drag_dest_gtk.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 "content/browser/web_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 167 matching lines @@
   // Decode the data.
   gint data_length = gtk_selection_data_get_length(data);
   const guchar* raw_data = gtk_selection_data_get_data(data);
   GdkAtom target = gtk_selection_data_get_target(data);
   if (raw_data && data_length > 0) {
     // If the source can't provide us with valid data for a requested target,
     // raw_data will be NULL.
     if (target == ui::GetAtomForTarget(ui::TEXT_PLAIN)) {
       guchar* text = gtk_selection_data_get_text(data);
       if (text) {
-        drop_data_->text = NullableString16(
+        drop_data_->text = base::NullableString16(
             UTF8ToUTF16(std::string(reinterpret_cast<const char*>(text))),
             false);
         g_free(text);
       }
     } else if (target == ui::GetAtomForTarget(ui::TEXT_URI_LIST)) {
       gchar** uris = gtk_selection_data_get_uris(data);
       if (uris) {
         drop_data_->url = GURL();
         for (gchar** uri_iter = uris; *uri_iter; uri_iter++) {
           // Most file managers populate text/uri-list with file URLs when
           // dragging files. To avoid exposing file system paths to web content,
           // file URLs are never set as the URL content for the drop.
           // TODO(estade): Can the filenames have a non-UTF8 encoding?
           GURL url(*uri_iter);
           base::FilePath file_path;
           if (url.SchemeIs(chrome::kFileScheme) &&
               net::FileURLToFilePath(url, &file_path)) {
             drop_data_->filenames.push_back(
                 WebDropData::FileInfo(UTF8ToUTF16(file_path.value()),
                                       string16()));
             // This is a hack. Some file managers also populate text/plain with
             // a file URL when dragging files, so we clear it to avoid exposing
             // it to the web content.
-            drop_data_->text = NullableString16(true);
+            drop_data_->text = base::NullableString16(true);
           } else if (!drop_data_->url.is_valid()) {
             // Also set the first non-file URL as the URL content for the drop.
             drop_data_->url = url;
           }
         }
         g_strfreev(uris);
       }
     } else if (target == ui::GetAtomForTarget(ui::TEXT_HTML)) {
       // TODO(estade): Can the html have a non-UTF8 encoding?
-      drop_data_->html = NullableString16(
+      drop_data_->html = base::NullableString16(
           UTF8ToUTF16(std::string(reinterpret_cast<const char*>(raw_data),
                                   data_length)),
           false);
       // We leave the base URL empty.
     } else if (target == ui::GetAtomForTarget(ui::NETSCAPE_URL)) {
       std::string netscape_url(reinterpret_cast<const char*>(raw_data),
                                data_length);
       size_t split = netscape_url.find_first_of('\n');
       if (split != std::string::npos) {
         drop_data_->url = GURL(netscape_url.substr(0, split));
@@ skipping 97 matching lines @@
   gtk_drag_finish(context, is_drop_target_, FALSE, time);
 
   return TRUE;
 }
 
 RenderViewHostImpl* WebDragDestGtk::GetRenderViewHost() const {
   return static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
 }
 
 }  // namespace content